]> granicus.if.org Git - php/commitdiff
fix types, add missing parentheses
authorAntony Dovgal <tony2001@php.net>
Mon, 7 Aug 2006 20:22:33 +0000 (20:22 +0000)
committerAntony Dovgal <tony2001@php.net>
Mon, 7 Aug 2006 20:22:33 +0000 (20:22 +0000)
ext/dom/node.c

index 90f0b067a53cce861b8da46058b92db4ce7b684d..6d16579e2732295444ec62e994f2e57929300e65 100644 (file)
@@ -1684,11 +1684,11 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode)
        xmlDocPtr docp;
        xmlNodeSetPtr nodeset = NULL;
        dom_object *intern;
-       long exclusive=0, with_comments=0, file_len=0;
+       zend_bool exclusive=0, with_comments=0;
        xmlChar **inclusive_ns_prefixes = NULL;
        char *file = NULL;
-    int ret = -1;
-    xmlOutputBufferPtr buf;
+       int ret = -1, file_len = 0;
+       xmlOutputBufferPtr buf;
        xmlXPathContextPtr ctxp=NULL;
        xmlXPathObjectPtr xpathobjp=NULL;
        zend_uchar file_type = IS_STRING;
@@ -1750,7 +1750,7 @@ static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode)
                int xquery_len;
 
                if (zend_hash_find(ht, "query", sizeof("query"), (void**)&tmp) == SUCCESS &&
-                   Z_TYPE_PP(tmp) == IS_STRING || Z_TYPE_PP(tmp) == IS_UNICODE) {
+                   (Z_TYPE_PP(tmp) == IS_STRING || Z_TYPE_PP(tmp) == IS_UNICODE)) {
                                zxquery = tmp;
 /*
                        if (Z_TYPE_PP(tmp) == IS_STRING) {