Annotation of parser3/src/lib/patches/gdome2.patch, revision 1.1.6.5
1.1.6.5 ! paf 1: *** ../0/gdome2-0.7.4/libgdome/gdome.h Thu May 23 19:46:18 2002
! 2: --- ./libgdome/gdome.h Fri Apr 11 12:19:31 2003
1.1.6.3 paf 3: ***************
4: *** 254,259 ****
1.1.6.5 ! paf 5: --- 254,260 ----
1.1.6.3 paf 6: GdomeDOMString *gdome_str_mkref (const gchar *str);
7: GdomeDOMString *gdome_str_mkref_own (gchar *str);
8: GdomeDOMString *gdome_str_mkref_dup (const gchar *str);
1.1.6.5 ! paf 9: + GdomeDOMString *gdome_str_mkref_xml (unsigned char /*xmlChar*/ *str);
1.1.6.3 paf 10: void gdome_str_ref (GdomeDOMString *self);
11: void gdome_str_unref (GdomeDOMString *self);
12: GdomeBoolean gdome_str_equal (GdomeDOMString *self,
1.1.6.5 ! paf 13: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-attribute.c Wed Apr 3 11:05:00 2002
! 14: --- ./libgdome/gdomecore/gdome-xml-attribute.c Fri Apr 11 12:12:42 2003
1.1.6.3 paf 15: ***************
16: *** 247,255 ****
17: value = xmlNodeGetContent ((xmlNode *)priv->n);
18:
19: if (value != NULL)
20: ! return gdome_xml_str_mkref_own (value);
21: else
22: ! return gdome_xml_str_mkref_dup("");
23: }
24:
25: /**
26: --- 247,255 ----
27: value = xmlNodeGetContent ((xmlNode *)priv->n);
28:
29: if (value != NULL)
30: ! return gdome_xml_str_mkref_xml (value);
31: else
32: ! return gdome_xml_str_mkref ("");
33: }
34:
35: /**
1.1.6.5 ! paf 36: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-cdata.c Mon Apr 1 21:08:24 2002
! 37: --- ./libgdome/gdomecore/gdome-xml-cdata.c Fri Apr 11 12:12:42 2003
1.1.6.3 paf 38: ***************
39: *** 184,190 ****
40: g_return_val_if_fail (GDOME_XML_IS_CD (priv), NULL);
41: g_return_val_if_fail (exc != NULL, NULL);
42:
43: ! return gdome_xml_str_mkref_own (xmlNodeGetContent (priv->n));
44: }
45:
46: /**
47: --- 184,190 ----
48: g_return_val_if_fail (GDOME_XML_IS_CD (priv), NULL);
49: g_return_val_if_fail (exc != NULL, NULL);
50:
51: ! return gdome_xml_str_mkref_xml (xmlNodeGetContent (priv->n));
52: }
53:
54: /**
55: ***************
56: *** 310,316 ****
57: ret[stop - start] = '\0';
58:
59: xmlFree (str);
60: ! return gdome_xml_str_mkref_own (ret);
61: }
62:
63: /**
64: --- 310,316 ----
65: ret[stop - start] = '\0';
66:
67: xmlFree (str);
68: ! return gdome_xml_str_mkref_xml (ret);
69: }
70:
71: /**
1.1.6.5 ! paf 72: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-element.c Mon Apr 1 21:08:24 2002
! 73: --- ./libgdome/gdomecore/gdome-xml-element.c Fri Apr 11 12:22:47 2003
1.1.6.3 paf 74: ***************
75: *** 144,150 ****
76: (gchar *) gdome_xmlGetNsPrefix(priv->n),
77: (gchar *) gdome_xmlGetName(priv->n)));
78: else
79: ! ret = gdome_xml_str_mkref_dup((gchar *)gdome_xmlGetName (priv->n));
80:
81: return ret;
82: }
83: --- 144,150 ----
84: (gchar *) gdome_xmlGetNsPrefix(priv->n),
85: (gchar *) gdome_xmlGetName(priv->n)));
86: else
1.1.6.5 ! paf 87: ! ret = gdome_xml_str_mkref_xml (gdome_xmlGetName (priv->n));
1.1.6.3 paf 88:
89: return ret;
90: }
91: ***************
1.1.6.5 ! paf 92: *** 196,202 ****
1.1.6.3 paf 93: value = xmlGetProp (priv->n, name->str);
94:
95: if (value != NULL)
96: ! return gdome_xml_str_mkref_own (value);
97: else {
98: strs = g_strsplit((gchar *)name->str, ":", 0);
99: if (xmlStrEqual(strs[0], "xmlns"))
1.1.6.5 ! paf 100: --- 196,202 ----
! 101: value = xmlGetProp (priv->n, name->str);
! 102:
! 103: if (value != NULL)
! 104: ! return gdome_xml_str_mkref_xml (value);
! 105: else {
! 106: strs = g_strsplit((gchar *)name->str, ":", 0);
! 107: if (xmlStrEqual(strs[0], "xmlns"))
! 108: ***************
! 109: *** 203,211 ****
1.1.6.3 paf 110: ns = gdome_xmlGetNsDecl(priv->n, strs[1]);
111: g_strfreev(strs);
112: if (ns != NULL)
113: ! return gdome_xml_str_mkref_dup ((gchar *)ns->href);
114: else
115: ! return gdome_xml_str_mkref_dup ("");
116: }
117: }
118:
1.1.6.5 ! paf 119: --- 203,211 ----
1.1.6.3 paf 120: ns = gdome_xmlGetNsDecl(priv->n, strs[1]);
121: g_strfreev(strs);
122: if (ns != NULL)
123: ! return gdome_xml_str_mkref_xml (ns->href);
124: else
125: ! return gdome_xml_str_mkref ("");
126: }
127: }
128:
129: ***************
130: *** 247,253 ****
131: return;
132: }
133:
134: ! prevValue = gdome_xml_str_mkref_own (xmlGetProp (priv->n, name->str));
135: attr = gdome_xml_n_mkref ((xmlNode *)xmlSetProp (priv->n, name->str, value->str));
136:
137: if (attr != NULL) {
138: --- 247,253 ----
139: return;
140: }
141:
142: ! prevValue = gdome_xml_str_mkref_xml (xmlGetProp (priv->n, name->str));
143: attr = gdome_xml_n_mkref ((xmlNode *)xmlSetProp (priv->n, name->str, value->str));
144:
145: if (attr != NULL) {
146: ***************
147: *** 534,548 ****
148: value = xmlGetNsProp (priv->n, localName->str, namespaceURI->str);
149:
150: if (value != NULL)
151: ! return gdome_xml_str_mkref_own (value);
152: else if (xmlStrEqual(namespaceURI->str, GDOME_XMLNS_NAMESPACE)) {
153: ns = gdome_xmlGetNsDecl(priv->n, localName->str);
154: if (ns != NULL)
155: ! return gdome_xml_str_mkref_dup ((gchar *)ns->href);
156: else
157: ! return gdome_xml_str_mkref_dup ("");
158: } else {
159: ! return gdome_xml_str_mkref_dup ("");
160: }
161: }
162:
163: --- 534,548 ----
164: value = xmlGetNsProp (priv->n, localName->str, namespaceURI->str);
165:
166: if (value != NULL)
167: ! return gdome_xml_str_mkref_xml (value);
168: else if (xmlStrEqual(namespaceURI->str, GDOME_XMLNS_NAMESPACE)) {
169: ns = gdome_xmlGetNsDecl(priv->n, localName->str);
170: if (ns != NULL)
171: ! return gdome_xml_str_mkref_xml (ns->href);
172: else
173: ! return gdome_xml_str_mkref ("");
174: } else {
175: ! return gdome_xml_str_mkref ("");
176: }
177: }
178:
179: ***************
180: *** 637,643 ****
181: g_free(localName);
182: }
183: else {
184: ! prevValue = gdome_xml_str_mkref_own (xmlGetProp (priv->n,
185: (xmlChar *)qualifiedName->str));
186: attr = gdome_xml_n_mkref ((xmlNode *)xmlSetProp (priv->n,
187: (xmlChar *)qualifiedName->str,
188: --- 637,643 ----
189: g_free(localName);
190: }
191: else {
192: ! prevValue = gdome_xml_str_mkref_xml (xmlGetProp (priv->n,
193: (xmlChar *)qualifiedName->str));
194: attr = gdome_xml_n_mkref ((xmlNode *)xmlSetProp (priv->n,
195: (xmlChar *)qualifiedName->str,
1.1.6.5 ! paf 196: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-node.c Wed Jan 22 00:29:16 2003
! 197: --- ./libgdome/gdomecore/gdome-xml-node.c Fri Apr 11 12:12:42 2003
1.1.6.3 paf 198: ***************
1.1.6.5 ! paf 199: *** 251,259 ****
1.1.6.3 paf 200: switch (type) {
201: case XML_DOCUMENT_TYPE_NODE:
1.1.6.5 ! paf 202: case XML_DTD_NODE:
1.1.6.3 paf 203: ! return gdome_xml_dt_unref (self, exc);
1.1.6.5 ! paf 204: case XML_DOCUMENT_NODE:
1.1.6.3 paf 205: ! return gdome_xml_doc_unref (self, exc);
206: default:
207: if (priv->refcnt > 0)
208: priv->refcnt--;
1.1.6.5 ! paf 209: --- 251,261 ----
1.1.6.3 paf 210: switch (type) {
211: case XML_DOCUMENT_TYPE_NODE:
1.1.6.5 ! paf 212: case XML_DTD_NODE:
1.1.6.3 paf 213: ! gdome_xml_dt_unref (self, exc);
214: ! return;
1.1.6.5 ! paf 215: case XML_DOCUMENT_NODE:
1.1.6.3 paf 216: ! gdome_xml_doc_unref (self, exc);
217: ! return;
218: default:
219: if (priv->refcnt > 0)
220: priv->refcnt--;
221: ***************
222: *** 634,640 ****
223: case XML_CDATA_SECTION_NODE:
224: case XML_COMMENT_NODE:
225: case XML_TEXT_NODE:
226: ! ret = gdome_xml_str_mkref_own (xmlNodeGetContent (priv->n));
227: break;
228: case XML_ELEMENT_NODE:
229: case XML_ENTITY_NODE:
230: --- 636,642 ----
231: case XML_CDATA_SECTION_NODE:
232: case XML_COMMENT_NODE:
233: case XML_TEXT_NODE:
234: ! ret = gdome_xml_str_mkref_xml (xmlNodeGetContent (priv->n));
235: break;
236: case XML_ELEMENT_NODE:
237: case XML_ENTITY_NODE:
1.1.6.5 ! paf 238: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-pi.c Mon Apr 1 21:08:24 2002
! 239: --- ./libgdome/gdomecore/gdome-xml-pi.c Fri Apr 11 12:12:42 2003
1.1.6.3 paf 240: ***************
241: *** 144,150 ****
242: g_return_val_if_fail (GDOME_XML_IS_PI (priv), NULL);
243: g_return_val_if_fail (exc != NULL, NULL);
244:
245: ! return gdome_xml_str_mkref_own (xmlNodeGetContent (priv->n));
246: }
247:
248: /**
249: --- 144,150 ----
250: g_return_val_if_fail (GDOME_XML_IS_PI (priv), NULL);
251: g_return_val_if_fail (exc != NULL, NULL);
252:
253: ! return gdome_xml_str_mkref_xml (xmlNodeGetContent (priv->n));
254: }
255:
256: /**
1.1.6.5 ! paf 257: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-str.c Mon Apr 1 21:08:24 2002
! 258: --- ./libgdome/gdomecore/gdome-xml-str.c Fri Apr 11 12:12:42 2003
1.1.6.3 paf 259: ***************
260: *** 51,57 ****
261:
262: void
263: gdome_xml_str_unref_xml (GdomeDOMString *self) {
264: ! xmlFree (self->str);
265: #ifdef DEBUG_REFCNT
266: gdome_refdbg_delRef ((void *)self, GDOME_REFDBG_STR);
267: #endif
268: --- 51,57 ----
269:
270: void
271: gdome_xml_str_unref_xml (GdomeDOMString *self) {
272: ! xmlFree ((xmlChar*)self->str);
273: #ifdef DEBUG_REFCNT
274: gdome_refdbg_delRef ((void *)self, GDOME_REFDBG_STR);
275: #endif
276: ***************
277: *** 115,121 ****
278: * Returns: the new DOMString object.
279: */
280: GdomeDOMString *
281: ! gdome_xml_str_mkref_xml (xmlChar *str) {
282: GdomeDOMString *ds;
283:
284: if (str == NULL)
285: --- 115,121 ----
286: * Returns: the new DOMString object.
287: */
288: GdomeDOMString *
289: ! gdome_xml_str_mkref_xml (const xmlChar *str) {
290: GdomeDOMString *ds;
291:
292: if (str == NULL)
293: ***************
294: *** 127,133 ****
295: #endif
296: ds->refcnt = 1;
297: ds->unref = gdome_xml_str_unref_xml;
298: ! ds->str = str;
299: return ds;
300: }
301:
302: --- 127,133 ----
303: #endif
304: ds->refcnt = 1;
305: ds->unref = gdome_xml_str_unref_xml;
306: ! ds->str = (gchar*)str;
307: return ds;
308: }
309:
1.1.6.5 ! paf 310: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-str.h Tue Aug 7 01:56:08 2001
! 311: --- ./libgdome/gdomecore/gdome-xml-str.h Fri Apr 11 12:12:42 2003
1.1.6.3 paf 312: ***************
313: *** 26,32 ****
314:
315: GdomeDOMString *gdome_xml_str_mkref (const gchar *str);
316: GdomeDOMString *gdome_xml_str_mkref_own (gchar *str);
317: ! GdomeDOMString *gdome_xml_str_mkref_xml (xmlChar *str);
318: GdomeDOMString *gdome_xml_str_mkref_dup (const gchar *str);
319:
320: void gdome_xml_str_ref (GdomeDOMString *self);
321: --- 26,32 ----
322:
323: GdomeDOMString *gdome_xml_str_mkref (const gchar *str);
324: GdomeDOMString *gdome_xml_str_mkref_own (gchar *str);
325: ! GdomeDOMString *gdome_xml_str_mkref_xml (const xmlChar *str);
326: GdomeDOMString *gdome_xml_str_mkref_dup (const gchar *str);
327:
328: void gdome_xml_str_ref (GdomeDOMString *self);
1.1.6.5 ! paf 329: *** ../0/gdome2-0.7.4/libgdome/xpath/gdome-xpath-xpnsresolv.c Fri Mar 1 06:33:47 2002
! 330: --- ./libgdome/xpath/gdome-xpath-xpnsresolv.c Fri Apr 11 12:12:42 2003
1.1.6.3 paf 331: ***************
332: *** 114,120 ****
333:
334: ns = xmlSearchNs(priv->n->doc, priv->n, prefix->str);
335: if (ns != NULL) {
336: ! return gdome_str_mkref_own ((gchar *)ns->href);
337: } else {
338: return NULL;
339: }
340: --- 114,120 ----
341:
342: ns = xmlSearchNs(priv->n->doc, priv->n, prefix->str);
343: if (ns != NULL) {
344: ! return gdome_str_mkref_xml (ns->href);
345: } else {
346: return NULL;
347: }
E-mail:
![[BACK]](/cvsweb/icons/back.gif){kind=icon}
Return to gdome2.patch CVS log ![[TXT]](/cvsweb/icons/text.gif){kind=icon}
![[DIR]](/cvsweb/icons/dir.gif){kind=icon}
Up to [parser3project] / parser3 / src / lib / patches