diff options
| author | Paul Eggert | 2011-02-06 22:15:32 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-02-06 22:15:32 -0800 |
| commit | c45e52762bee7033872fbc34f3dc3a343c77855d (patch) | |
| tree | 6ebb44281d696466865e5c0548481a97a39fd55d /src/xml.c | |
| parent | 3ce2f8ac4c06bf64c43e5ae138b903310927ac79 (diff) | |
| download | emacs-c45e52762bee7033872fbc34f3dc3a343c77855d.tar.gz emacs-c45e52762bee7033872fbc34f3dc3a343c77855d.zip | |
* xml.c: conform to C89 pointer rules
Diffstat (limited to 'src/xml.c')
| -rw-r--r-- | src/xml.c | 13 |
1 files changed, 7 insertions, 6 deletions
| @@ -32,7 +32,7 @@ Lisp_Object make_dom (xmlNode *node) | |||
| 32 | { | 32 | { |
| 33 | if (node->type == XML_ELEMENT_NODE) | 33 | if (node->type == XML_ELEMENT_NODE) |
| 34 | { | 34 | { |
| 35 | Lisp_Object result = Fcons (intern (node->name), Qnil); | 35 | Lisp_Object result = Fcons (intern ((char *) node->name), Qnil); |
| 36 | xmlNode *child; | 36 | xmlNode *child; |
| 37 | xmlAttr *property; | 37 | xmlAttr *property; |
| 38 | Lisp_Object plist = Qnil; | 38 | Lisp_Object plist = Qnil; |
| @@ -44,8 +44,9 @@ Lisp_Object make_dom (xmlNode *node) | |||
| 44 | if (property->children && | 44 | if (property->children && |
| 45 | property->children->content) | 45 | property->children->content) |
| 46 | { | 46 | { |
| 47 | plist = Fcons (Fcons (intern (property->name), | 47 | char *content = (char *) property->children->content; |
| 48 | build_string (property->children->content)), | 48 | plist = Fcons (Fcons (intern ((char *) property->name), |
| 49 | build_string (content)), | ||
| 49 | plist); | 50 | plist); |
| 50 | } | 51 | } |
| 51 | property = property->next; | 52 | property = property->next; |
| @@ -65,7 +66,7 @@ Lisp_Object make_dom (xmlNode *node) | |||
| 65 | else if (node->type == XML_TEXT_NODE || node->type == XML_CDATA_SECTION_NODE) | 66 | else if (node->type == XML_TEXT_NODE || node->type == XML_CDATA_SECTION_NODE) |
| 66 | { | 67 | { |
| 67 | if (node->content) | 68 | if (node->content) |
| 68 | return build_string (node->content); | 69 | return build_string ((char *) node->content); |
| 69 | else | 70 | else |
| 70 | return Qnil; | 71 | return Qnil; |
| 71 | } | 72 | } |
| @@ -102,13 +103,13 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html | |||
| 102 | bytes = CHAR_TO_BYTE (iend) - CHAR_TO_BYTE (istart); | 103 | bytes = CHAR_TO_BYTE (iend) - CHAR_TO_BYTE (istart); |
| 103 | 104 | ||
| 104 | if (htmlp) | 105 | if (htmlp) |
| 105 | doc = htmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), | 106 | doc = htmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), |
| 106 | bytes, burl, "utf-8", | 107 | bytes, burl, "utf-8", |
| 107 | HTML_PARSE_RECOVER|HTML_PARSE_NONET| | 108 | HTML_PARSE_RECOVER|HTML_PARSE_NONET| |
| 108 | HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR| | 109 | HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR| |
| 109 | HTML_PARSE_NOBLANKS); | 110 | HTML_PARSE_NOBLANKS); |
| 110 | else | 111 | else |
| 111 | doc = xmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), | 112 | doc = xmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), |
| 112 | bytes, burl, "utf-8", | 113 | bytes, burl, "utf-8", |
| 113 | XML_PARSE_NONET|XML_PARSE_NOWARNING| | 114 | XML_PARSE_NONET|XML_PARSE_NOWARNING| |
| 114 | XML_PARSE_NOERROR); | 115 | XML_PARSE_NOERROR); |