~ubuntu-branches/ubuntu/saucy/libxml2/saucy-proposed

« back to all changes in this revision

Viewing changes to xmlreader.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-06-23 21:19:36 UTC
  • mto: (10.1.1 lenny) (43.1.7 sid)
  • mto: This revision was merged to the branch mainline in revision 25.
  • Revision ID: james.westby@ubuntu.com-20080623211936-v5ix4se54w532dls
Tags: upstream-2.6.32.dfsg
ImportĀ upstreamĀ versionĀ 2.6.32.dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
234
234
    if (table == NULL) 
235
235
        return(-1);
236
236
 
237
 
    if (attr == NULL)
238
 
        return(-1);
239
237
    ID = xmlNodeListGetString(doc, attr->children, 1);
240
238
    if (ID == NULL)
241
239
        return(-1);
2936
2934
 *
2937
2935
 * Get the node type of the current node
2938
2936
 * Reference:
2939
 
 * http://dotgnu.org/pnetlib-doc/System/Xml/XmlNodeType.html
 
2937
 * http://www.gnu.org/software/dotgnu/pnetlib-doc/System/Xml/XmlNodeType.html
2940
2938
 *
2941
2939
 * Returns the xmlNodeType of the current node or -1 in case of error
2942
2940
 */
3960
3958
        return(NULL);
3961
3959
    if (reader->doc != NULL)
3962
3960
        return(reader->doc);
3963
 
    if ((reader == NULL) || (reader->ctxt == NULL) ||
3964
 
        (reader->ctxt->myDoc == NULL))
 
3961
    if ((reader->ctxt == NULL) || (reader->ctxt->myDoc == NULL))
3965
3962
        return(NULL);
3966
3963
    
3967
3964
    reader->preserve = 1;