[Emacs-diffs] /srv/bzr/emacs/trunk r103175: Merge: * xml.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103175 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 22:16:13 -0800
message:
  Merge: * xml.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/xml.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-07 05:47:56 +0000
+++ b/src/ChangeLog     2011-02-07 06:15:32 +0000
@@ -28,6 +28,7 @@
        * indent.c (compute_motion): Likewise.
        * xfont.c (xfont_decode_coding_xlfd): Likewise.
        * ralloc.c (resize_bloc): Likewise.
+       * xml.c (make_dom, parse_region): Likewise.
        * character.c (strwidth): Make its argument const char *, not const
        unsigned char *, since more callers prefer it that way.  All callers
        changed.

=== modified file 'src/xml.c'
--- a/src/xml.c 2011-01-30 22:17:44 +0000
+++ b/src/xml.c 2011-02-07 06:15:32 +0000
@@ -32,7 +32,7 @@
 {
   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 @@
          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 @@
   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 @@
   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);