Annotation of parser3/src/lib/patches/gdome2.patch, revision 1.2
1.2 ! paf 1: *** ../0/gdome2-0.7.4/libgdome/gdome.c Thu May 23 19:46:17 2002
! 2: --- ./libgdome/gdome.c Fri Apr 11 13:09:18 2003
1.1 paf 3: ***************
1.2 ! paf 4: *** 84,90 ****
! 5: * Returns: the new DOMString object.
! 6: */
! 7: GdomeDOMString *
! 8: ! gdome_str_mkref_xml (xmlChar *str)
! 9: {
! 10: return gdome_xml_str_mkref_xml (str);
! 11: }
! 12: --- 84,90 ----
! 13: * Returns: the new DOMString object.
! 14: */
! 15: GdomeDOMString *
! 16: ! gdome_str_mkref_xml (const xmlChar *str)
! 17: {
! 18: return gdome_xml_str_mkref_xml (str);
! 19: }
! 20: *** ../0/gdome2-0.7.4/libgdome/gdome.h Thu May 23 19:46:18 2002
! 21: --- ./libgdome/gdome.h Fri Apr 11 13:15:28 2003
! 22: ***************
! 23: *** 254,259 ****
! 24: --- 254,260 ----
! 25: GdomeDOMString *gdome_str_mkref (const gchar *str);
! 26: GdomeDOMString *gdome_str_mkref_own (gchar *str);
! 27: GdomeDOMString *gdome_str_mkref_dup (const gchar *str);
! 28: + GdomeDOMString *gdome_str_mkref_xml (const unsigned char /*xmlChar*/ *str);
! 29: void gdome_str_ref (GdomeDOMString *self);
! 30: void gdome_str_unref (GdomeDOMString *self);
! 31: GdomeBoolean gdome_str_equal (GdomeDOMString *self,
! 32: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-attribute.c Wed Apr 3 11:05:00 2002
! 33: --- ./libgdome/gdomecore/gdome-xml-attribute.c Fri Apr 11 12:12:42 2003
! 34: ***************
! 35: *** 247,255 ****
! 36: value = xmlNodeGetContent ((xmlNode *)priv->n);
! 37:
! 38: if (value != NULL)
! 39: ! return gdome_xml_str_mkref_own (value);
! 40: else
! 41: ! return gdome_xml_str_mkref_dup("");
! 42: }
! 43:
! 44: /**
! 45: --- 247,255 ----
! 46: value = xmlNodeGetContent ((xmlNode *)priv->n);
! 47:
! 48: if (value != NULL)
! 49: ! return gdome_xml_str_mkref_xml (value);
! 50: else
! 51: ! return gdome_xml_str_mkref ("");
! 52: }
! 53:
! 54: /**
! 55: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-cdata.c Mon Apr 1 21:08:24 2002
! 56: --- ./libgdome/gdomecore/gdome-xml-cdata.c Fri Apr 11 12:12:42 2003
! 57: ***************
! 58: *** 184,190 ****
! 59: g_return_val_if_fail (GDOME_XML_IS_CD (priv), NULL);
! 60: g_return_val_if_fail (exc != NULL, NULL);
! 61:
! 62: ! return gdome_xml_str_mkref_own (xmlNodeGetContent (priv->n));
! 63: }
! 64:
! 65: /**
! 66: --- 184,190 ----
! 67: g_return_val_if_fail (GDOME_XML_IS_CD (priv), NULL);
! 68: g_return_val_if_fail (exc != NULL, NULL);
! 69:
! 70: ! return gdome_xml_str_mkref_xml (xmlNodeGetContent (priv->n));
! 71: }
! 72:
! 73: /**
! 74: ***************
! 75: *** 310,316 ****
! 76: ret[stop - start] = '\0';
! 77:
! 78: xmlFree (str);
! 79: ! return gdome_xml_str_mkref_own (ret);
! 80: }
! 81:
! 82: /**
! 83: --- 310,316 ----
! 84: ret[stop - start] = '\0';
! 85:
! 86: xmlFree (str);
! 87: ! return gdome_xml_str_mkref_xml (ret);
! 88: }
! 89:
! 90: /**
! 91: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-element.c Mon Apr 1 21:08:24 2002
! 92: --- ./libgdome/gdomecore/gdome-xml-element.c Fri Apr 11 13:12:35 2003
! 93: ***************
! 94: *** 144,150 ****
! 95: (gchar *) gdome_xmlGetNsPrefix(priv->n),
! 96: (gchar *) gdome_xmlGetName(priv->n)));
! 97: else
! 98: ! ret = gdome_xml_str_mkref_dup((gchar *)gdome_xmlGetName (priv->n));
! 99:
! 100: return ret;
! 101: }
! 102: --- 144,150 ----
! 103: (gchar *) gdome_xmlGetNsPrefix(priv->n),
! 104: (gchar *) gdome_xmlGetName(priv->n)));
! 105: else
! 106: ! ret = gdome_xml_str_mkref_dup (gdome_xmlGetName (priv->n));
! 107:
! 108: return ret;
! 109: }
! 110: ***************
! 111: *** 196,202 ****
! 112: value = xmlGetProp (priv->n, name->str);
! 113:
! 114: if (value != NULL)
! 115: ! return gdome_xml_str_mkref_own (value);
! 116: else {
! 117: strs = g_strsplit((gchar *)name->str, ":", 0);
! 118: if (xmlStrEqual(strs[0], "xmlns"))
! 119: --- 196,202 ----
! 120: value = xmlGetProp (priv->n, name->str);
! 121:
! 122: if (value != NULL)
! 123: ! return gdome_xml_str_mkref_xml (value);
! 124: else {
! 125: strs = g_strsplit((gchar *)name->str, ":", 0);
! 126: if (xmlStrEqual(strs[0], "xmlns"))
! 127: ***************
! 128: *** 203,211 ****
! 129: ns = gdome_xmlGetNsDecl(priv->n, strs[1]);
! 130: g_strfreev(strs);
! 131: if (ns != NULL)
! 132: ! return gdome_xml_str_mkref_dup ((gchar *)ns->href);
! 133: else
! 134: ! return gdome_xml_str_mkref_dup ("");
! 135: }
! 136: }
! 137:
! 138: --- 203,211 ----
! 139: ns = gdome_xmlGetNsDecl(priv->n, strs[1]);
! 140: g_strfreev(strs);
! 141: if (ns != NULL)
! 142: ! return gdome_xml_str_mkref_dup (ns->href);
! 143: else
! 144: ! return gdome_xml_str_mkref ("");
! 145: }
! 146: }
! 147:
! 148: ***************
! 149: *** 247,253 ****
! 150: return;
! 151: }
! 152:
! 153: ! prevValue = gdome_xml_str_mkref_own (xmlGetProp (priv->n, name->str));
! 154: attr = gdome_xml_n_mkref ((xmlNode *)xmlSetProp (priv->n, name->str, value->str));
! 155:
! 156: if (attr != NULL) {
! 157: --- 247,253 ----
! 158: return;
! 159: }
! 160:
! 161: ! prevValue = gdome_xml_str_mkref_xml (xmlGetProp (priv->n, name->str));
! 162: attr = gdome_xml_n_mkref ((xmlNode *)xmlSetProp (priv->n, name->str, value->str));
! 163:
! 164: if (attr != NULL) {
! 165: ***************
! 166: *** 534,548 ****
! 167: value = xmlGetNsProp (priv->n, localName->str, namespaceURI->str);
! 168:
! 169: if (value != NULL)
! 170: ! return gdome_xml_str_mkref_own (value);
! 171: else if (xmlStrEqual(namespaceURI->str, GDOME_XMLNS_NAMESPACE)) {
! 172: ns = gdome_xmlGetNsDecl(priv->n, localName->str);
! 173: if (ns != NULL)
! 174: ! return gdome_xml_str_mkref_dup ((gchar *)ns->href);
! 175: else
! 176: ! return gdome_xml_str_mkref_dup ("");
! 177: } else {
! 178: ! return gdome_xml_str_mkref_dup ("");
! 179: }
! 180: }
! 181:
! 182: --- 534,548 ----
! 183: value = xmlGetNsProp (priv->n, localName->str, namespaceURI->str);
! 184:
! 185: if (value != NULL)
! 186: ! return gdome_xml_str_mkref_xml (value);
! 187: else if (xmlStrEqual(namespaceURI->str, GDOME_XMLNS_NAMESPACE)) {
! 188: ns = gdome_xmlGetNsDecl(priv->n, localName->str);
! 189: if (ns != NULL)
! 190: ! return gdome_xml_str_mkref_dup (ns->href);
! 191: else
! 192: ! return gdome_xml_str_mkref ("");
! 193: } else {
! 194: ! return gdome_xml_str_mkref ("");
! 195: }
! 196: }
! 197:
! 198: ***************
! 199: *** 637,643 ****
! 200: g_free(localName);
! 201: }
! 202: else {
! 203: ! prevValue = gdome_xml_str_mkref_own (xmlGetProp (priv->n,
! 204: (xmlChar *)qualifiedName->str));
! 205: attr = gdome_xml_n_mkref ((xmlNode *)xmlSetProp (priv->n,
! 206: (xmlChar *)qualifiedName->str,
! 207: --- 637,643 ----
! 208: g_free(localName);
! 209: }
! 210: else {
! 211: ! prevValue = gdome_xml_str_mkref_xml (xmlGetProp (priv->n,
! 212: (xmlChar *)qualifiedName->str));
! 213: attr = gdome_xml_n_mkref ((xmlNode *)xmlSetProp (priv->n,
! 214: (xmlChar *)qualifiedName->str,
! 215: *** ../0/gdome2-0.7.4/libgdome/gdomecore/gdome-xml-node.c Wed Jan 22 00:29:16 2003
! 216: --- ./libgdome/gdomecore/gdome-xml-node.c Fri Apr 11 12:12:42 2003
! 217: ***************
! 218: *** 251,259 ****
! 219: switch (type) {
! 220: case XML_DOCUMENT_TYPE_NODE:
! 221: case XML_DTD_NODE:
! 222: ! return gdome_xml_dt_unref (self, exc);
! 223: case XML_DOCUMENT_NODE:
! 224: ! return gdome_xml_doc_unref (self, exc);
! 225: default:
! 226: if (priv->refcnt > 0)
! 227: priv->refcnt--;
! 228: --- 251,261 ----
! 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: *** ../0/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 12:12:42 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: *** ../0/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 12:12:42 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: *** ../0/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 12:12:42 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: *** ../0/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 12:12:42 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 ----
1.1 paf 360:
1.2 ! paf 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