[Emacs-diffs] /srv/bzr/emacs/trunk r101437: * xml.c (parse_string): Renamed to parse_string(), since that's

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 101437
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Tue 2010-09-14 20:37:26 +0200
message:
  * xml.c (parse_string): Renamed to parse_string(), since that's
  what it does.
  (parse_string): Return nil when the document can't be parsed.
modified:
  src/ChangeLog
  src/xml.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-09-14 14:41:53 +0000
+++ b/src/ChangeLog     2010-09-14 18:37:26 +0000
@@ -1,3 +1,9 @@
+2010-09-14  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * xml.c (parse_string): Renamed to parse_string(), since that's
+       what it does.
+       (parse_string): Return nil when the document can't be parsed.
+
 2010-09-14  Jan Djärv  <address@hidden>
 
        * xterm.c (get_current_vm_state): New function.

=== modified file 'src/xml.c'
--- a/src/xml.c 2010-09-14 07:53:39 +0000
+++ b/src/xml.c 2010-09-14 18:37:26 +0000
@@ -69,11 +69,11 @@
 }
 
 static Lisp_Object
-parse_buffer (Lisp_Object string, Lisp_Object base_url, int htmlp)
+parse_string (Lisp_Object string, Lisp_Object base_url, int htmlp)
 {
   xmlDoc *doc;
   xmlNode *node;
-  Lisp_Object result;
+  Lisp_Object result = Qnil;
   int ibeg, iend;
   char *burl = "";
 
@@ -114,7 +114,7 @@
 the HTML document.  */)
   (Lisp_Object string, Lisp_Object base_url)
 {
-  return parse_buffer (string, base_url, 1);
+  return parse_string (string, base_url, 1);
 }
 
 DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
@@ -124,7 +124,7 @@
 the XML document.  */)
   (Lisp_Object string, Lisp_Object base_url)
 {
-  return parse_buffer (string, base_url, 0);
+  return parse_string (string, base_url, 0);
 }