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