[PHP-CVS] cvs: php-src /ext/dom namednodemap.c nodelist.c /ext/openssl openssl.c

[Ilia Alshanetsky]

iliaa           Mon Mar 29 14:57:49 2004 EDT

  Modified files:              
    /php-src/ext/openssl        openssl.c 
    /php-src/ext/dom    namednodemap.c nodelist.c 
  Log:
  Fixed compiler warnings.
  
  
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.87&r2=1.88&ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.87 php-src/ext/openssl/openssl.c:1.88
--- php-src/ext/openssl/openssl.c:1.87  Thu Jan  8 03:16:39 2004
+++ php-src/ext/openssl/openssl.c       Mon Mar 29 14:57:48 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: openssl.c,v 1.87 2004/01/08 08:16:39 andi Exp $ */
+/* $Id: openssl.c,v 1.88 2004/03/29 19:57:48 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3082,7 +3082,6 @@
        X509 *err_cert;
        int err, depth, ret;
        zval **val;
-       TSRMLS_FETCH();
 
        ret = preverify_ok;
 
http://cvs.php.net/diff.php/php-src/ext/dom/namednodemap.c?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/dom/namednodemap.c
diff -u php-src/ext/dom/namednodemap.c:1.9 php-src/ext/dom/namednodemap.c:1.10
--- php-src/ext/dom/namednodemap.c:1.9  Tue Feb 17 06:13:47 2004
+++ php-src/ext/dom/namednodemap.c      Mon Mar 29 14:57:48 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: namednodemap.c,v 1.9 2004/02/17 11:13:47 rrichards Exp $ */
+/* $Id: namednodemap.c,v 1.10 2004/03/29 19:57:48 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -205,13 +205,13 @@
                                }
                        }
                }
-       }
 
-       if (itemnode) {
-               DOM_RET_OBJ(rv, itemnode, &ret, objmap->baseobj);
-       } else {
-               RETVAL_NULL();
+               if (itemnode) {
+                       DOM_RET_OBJ(rv, itemnode, &ret, objmap->baseobj);
+               }
        }
+
+       RETVAL_NULL();
 }
 /* }}} end dom_namednodemap_item */
 
http://cvs.php.net/diff.php/php-src/ext/dom/nodelist.c?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/dom/nodelist.c
diff -u php-src/ext/dom/nodelist.c:1.11 php-src/ext/dom/nodelist.c:1.12
--- php-src/ext/dom/nodelist.c:1.11     Tue Feb 17 06:13:47 2004
+++ php-src/ext/dom/nodelist.c  Mon Mar 29 14:57:48 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: nodelist.c,v 1.11 2004/02/17 11:13:47 rrichards Exp $ */
+/* $Id: nodelist.c,v 1.12 2004/03/29 19:57:48 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -157,13 +157,13 @@
                                }
                        }
                }
-       }
 
-       if (itemnode) {
-               DOM_RET_OBJ(rv, itemnode, &ret, objmap->baseobj);
-       } else {
-               RETVAL_NULL();
+               if (itemnode) {
+                       DOM_RET_OBJ(rv, itemnode, &ret, objmap->baseobj);
+               }
        }
+
+       RETVAL_NULL();
 }
 /* }}} end dom_nodelist_item */
 #endif

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php