libxml2 r3708 - trunk

[veillard svn gnome org]

Author: veillard
Date: Fri Mar 14 14:29:40 2008
New Revision: 3708
URL: http://svn.gnome.org/viewvc/libxml2?rev=3708&view=rev

Log:
* xmlreader.c: patch from Ashwin removing duplicate tests
Daniel


Modified:
   trunk/ChangeLog
   trunk/xmlreader.c

Modified: trunk/xmlreader.c
==============================================================================
--- trunk/xmlreader.c	(original)
+++ trunk/xmlreader.c	Fri Mar 14 14:29:40 2008
@@ -234,8 +234,6 @@
     if (table == NULL) 
         return(-1);
 
-    if (attr == NULL)
-	return(-1);
     ID = xmlNodeListGetString(doc, attr->children, 1);
     if (ID == NULL)
 	return(-1);
@@ -3960,8 +3958,7 @@
 	return(NULL);
     if (reader->doc != NULL)
         return(reader->doc);
-    if ((reader == NULL) || (reader->ctxt == NULL) ||
-        (reader->ctxt->myDoc == NULL))
+    if ((reader->ctxt == NULL) || (reader->ctxt->myDoc == NULL))
 	return(NULL);
     
     reader->preserve = 1;