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