[perl-xml-cvs] CVS: XML-LibXML-XPathContext XPathContext.xs,1.19,1.20

[Ilya M. <m_...@us...>]

Update of /cvsroot/perl-xml/XML-LibXML-XPathContext
In directory sc8-pr-cvs1:/tmp/cvs-serv14591

Modified Files:
	XPathContext.xs 
Log Message:
Cosmetic fixes


Index: XPathContext.xs
===================================================================
RCS file: /cvsroot/perl-xml/XML-LibXML-XPathContext/XPathContext.xs,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- XPathContext.xs	23 Mar 2003 18:24:36 -0000	1.19
+++ XPathContext.xs	23 Mar 2003 20:00:10 -0000	1.20
@@ -122,7 +122,7 @@
     if (SvROK(perl_result) &&
         SvTYPE(SvRV(perl_result)) == SVt_PVAV) {
         /* consider any array ref to be a nodelist */
-        int i = 0;
+        int i;
         int length;
         SV ** pnode;
         AV * array_result;
@@ -132,7 +132,7 @@
         ret = (xmlXPathObjectPtr) xmlXPathNewNodeSet((xmlNodePtr) NULL);
         array_result = (AV*)SvRV(perl_result);
         length = av_len(array_result);
-        for( i; i <= length ; i++ ) {
+        for( i = 0; i <= length ; i++ ) {
             pnode = av_fetch(array_result,i,0);
             if (pnode != NULL && sv_isobject(*pnode) &&
                 sv_derived_from(*pnode,"XML::LibXML::Node")) {
@@ -166,34 +166,26 @@
                 return ret;
             }
             else if (sv_isa(perl_result, "XML::LibXML::Boolean")) {
-                int tmp_int;
-
                 /* warn("result is a boolean\n"); */
-                tmp_int = SvIV(SvRV(perl_result));
-                return (xmlXPathObjectPtr)xmlXPathNewBoolean(tmp_int);
+                return (xmlXPathObjectPtr)
+                    xmlXPathNewBoolean(SvIV(SvRV(perl_result)));
             }
             else if (sv_isa(perl_result, "XML::LibXML::Literal")) {
-                char * tmp_string;
-                STRLEN n_a;
-
                 /* warn("result is a literal\n"); */
-                tmp_string = SvPV(SvRV(perl_result), n_a);
-                return (xmlXPathObjectPtr)xmlXPathNewCString(tmp_string);
+                return (xmlXPathObjectPtr)
+                    xmlXPathNewCString(SvPV_nolen(SvRV(perl_result)));
             }
             else if (sv_isa(perl_result, "XML::LibXML::Number")) {
-                double tmp_double;
-
-                /* warn("result is a number\n"); */
-                tmp_double = SvNV(SvRV(perl_result));
-                return (xmlXPathObjectPtr)xmlXPathNewFloat(tmp_double);
+                return (xmlXPathObjectPtr)
+                    xmlXPathNewFloat(SvNV(SvRV(perl_result)));
             }
         } else if (SvNOK(perl_result) || SvIOK(perl_result)) {
             /* warn("result is an unblessed number\n"); */
             return (xmlXPathObjectPtr)xmlXPathNewFloat(SvNV(perl_result));
         } else {
             /* warn("result is an unblessed string\n"); */
-            STRLEN n_a;
-            return (xmlXPathObjectPtr)xmlXPathNewCString(SvPV(perl_result, n_a));
+            return (xmlXPathObjectPtr)
+                xmlXPathNewCString(SvPV_nolen(perl_result));
         }
 }
 
@@ -211,10 +203,7 @@
     SV ** lookup_func;
     SV ** lookup_data;
     I32 count;
-    STRLEN n_a;
-    SV * perl_result;
     dSP;
-    int tmp_int;
     SV * data;
     SV ** fetch;
 
@@ -244,12 +233,11 @@
     SPAGAIN;
     if (SvTRUE(ERRSV)) {
         POPs;
-        croak("XPathContext: error coming back from variable lookup function. %s\n", SvPV(ERRSV, n_a));
+        croak("XPathContext: error coming back from variable lookup function. %s\n", SvPV_nolen(ERRSV));
     } 
     if (count != 1) croak("XPathContext: variable lookup function returned more than one argument!\n");
 
-    perl_result = POPs;
-    ret = LibXML_perldata_to_LibXMLdata(NULL, perl_result);
+    ret = LibXML_perldata_to_LibXMLdata(NULL, POPs);
 
     PUTBACK;
     FREETMPS;
@@ -270,9 +258,7 @@
     SV * perl_dispatch;
     int i;
     STRLEN len;
-    SV * perl_result;
     ProxyNodePtr owner = NULL;
-    STRLEN n_a;
     SV *key;
     char *strkey;
     const char *function, *uri;
@@ -398,13 +384,12 @@
 
     if (SvTRUE(ERRSV)) {
         POPs;
-        croak("XPathContext: error coming back from perl-dispatcher in pm file. %s\n", SvPV(ERRSV, n_a));
+        croak("XPathContext: error coming back from perl-dispatcher in pm file. %s\n", SvPV_nolen(ERRSV));
     } 
 
     if (count != 1) croak("XPathContext: perl-dispatcher in pm file returned more than one argument!\n");
     
-    perl_result = POPs;
-    ret = LibXML_perldata_to_LibXMLdata(ctxt, perl_result);
+    ret = LibXML_perldata_to_LibXMLdata(ctxt, POPs);
 
     valuePush(ctxt, ret);
     PUTBACK;