aboutsummaryrefslogtreecommitdiffstats
path: root/src/xml.c
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-09-14 20:37:26 +0200
committerLars Magne Ingebrigtsen2010-09-14 20:37:26 +0200
commitc97c655f5f1e26f3fdde6d5907afcd9ab4cd5bf1 (patch)
tree07b45b2db729d45d712733fd9b0549d1859cb39d /src/xml.c
parent5e2a84e30d41c4804111d8b2b3d74b40da1c3f57 (diff)
downloademacs-c97c655f5f1e26f3fdde6d5907afcd9ab4cd5bf1.tar.gz
emacs-c97c655f5f1e26f3fdde6d5907afcd9ab4cd5bf1.zip
* 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.
Diffstat (limited to 'src/xml.c')
-rw-r--r--src/xml.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xml.c b/src/xml.c
index eb844950d05..ddecabb5317 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -69,11 +69,11 @@ Lisp_Object make_dom (xmlNode *node)
69} 69}
70 70
71static Lisp_Object 71static Lisp_Object
72parse_buffer (Lisp_Object string, Lisp_Object base_url, int htmlp) 72parse_string (Lisp_Object string, Lisp_Object base_url, int htmlp)
73{ 73{
74 xmlDoc *doc; 74 xmlDoc *doc;
75 xmlNode *node; 75 xmlNode *node;
76 Lisp_Object result; 76 Lisp_Object result = Qnil;
77 int ibeg, iend; 77 int ibeg, iend;
78 char *burl = ""; 78 char *burl = "";
79 79
@@ -114,7 +114,7 @@ If BASE-URL is non-nil, it will be used to expand relative URLs in
114the HTML document. */) 114the HTML document. */)
115 (Lisp_Object string, Lisp_Object base_url) 115 (Lisp_Object string, Lisp_Object base_url)
116{ 116{
117 return parse_buffer (string, base_url, 1); 117 return parse_string (string, base_url, 1);
118} 118}
119 119
120DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string, 120DEFUN ("xml-parse-string", Fxml_parse_string, Sxml_parse_string,
@@ -124,7 +124,7 @@ If BASE-URL is non-nil, it will be used to expand relative URLs in
124the XML document. */) 124the XML document. */)
125 (Lisp_Object string, Lisp_Object base_url) 125 (Lisp_Object string, Lisp_Object base_url)
126{ 126{
127 return parse_buffer (string, base_url, 0); 127 return parse_string (string, base_url, 0);
128} 128}
129 129
130 130