diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-06 22:15:32 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-06 22:15:32 -0800 |
| commit | c45e52762bee7033872fbc34f3dc3a343c77855d (patch) | |
| tree | 6ebb44281d696466865e5c0548481a97a39fd55d /src/xml.c | |
| parent | 3ce2f8ac4c06bf64c43e5ae138b903310927ac79 (diff) | |
| download | emacs-c45e52762bee7033872fbc34f3dc3a343c77855d.tar.gz | |
* 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
diff --git a/src/xml.c b/src/xml.c index 16907d4b44a..12ef14e6b9f 100644 --- a/src/xml.c +++ b/src/xml.c @@ -32,7 +32,7 @@ Lisp_Object make_dom (xmlNode *node) { if (node->type == XML_ELEMENT_NODE) { - Lisp_Object result = Fcons (intern (node->name), Qnil); + Lisp_Object result = Fcons (intern ((char *) node->name), Qnil); xmlNode *child; xmlAttr *property; Lisp_Object plist = Qnil; @@ -44,8 +44,9 @@ Lisp_Object make_dom (xmlNode *node) if (property->children && property->children->content) { - plist = Fcons (Fcons (intern (property->name), - build_string (property->children->content)), + char *content = (char *) property->children->content; + plist = Fcons (Fcons (intern ((char *) property->name), + build_string (content)), plist); } property = property->next; @@ -65,7 +66,7 @@ Lisp_Object make_dom (xmlNode *node) else if (node->type == XML_TEXT_NODE || node->type == XML_CDATA_SECTION_NODE) { if (node->content) - return build_string (node->content); + return build_string ((char *) node->content); else return Qnil; } @@ -102,13 +103,13 @@ parse_region (Lisp_Object start, Lisp_Object end, Lisp_Object base_url, int html bytes = CHAR_TO_BYTE (iend) - CHAR_TO_BYTE (istart); if (htmlp) - doc = htmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), + doc = htmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), bytes, burl, "utf-8", HTML_PARSE_RECOVER|HTML_PARSE_NONET| HTML_PARSE_NOWARNING|HTML_PARSE_NOERROR| HTML_PARSE_NOBLANKS); else - doc = xmlReadMemory (BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), + doc = xmlReadMemory ((char *) BYTE_POS_ADDR (CHAR_TO_BYTE (istart)), bytes, burl, "utf-8", XML_PARSE_NONET|XML_PARSE_NOWARNING| XML_PARSE_NOERROR); |