nlopess Sat Sep 29 11:26:51 2007 UTC Modified files: /php-src/ext/openssl xp_ssl.c /php-src/ext/standard var_unserializer.c var_unserializer.re /php-src/sapi/cli php_cli_readline.c Log: MFB: fix compiler warnings http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.33&r2=1.34&diff_format=u Index: php-src/ext/openssl/xp_ssl.c diff -u php-src/ext/openssl/xp_ssl.c:1.33 php-src/ext/openssl/xp_ssl.c:1.34 --- php-src/ext/openssl/xp_ssl.c:1.33 Sun May 27 19:13:11 2007 +++ php-src/ext/openssl/xp_ssl.c Sat Sep 29 11:26:51 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_ssl.c,v 1.33 2007/05/27 19:13:11 tony2001 Exp $ */ +/* $Id: xp_ssl.c,v 1.34 2007/09/29 11:26:51 nlopess Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -464,7 +464,7 @@ "ssl", "peer_certificate", zcert); peer_cert = NULL; - efree(zcert); + FREE_ZVAL(zcert); } if (SUCCESS == php_stream_context_get_option( @@ -490,8 +490,8 @@ zend_list_insert(mycert, php_openssl_get_x509_list_id())); add_next_index_zval(arr, zcert); + FREE_ZVAL(zcert); } - efree(zcert); } else { ZVAL_NULL(arr); } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.90&r2=1.91&diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.90 php-src/ext/standard/var_unserializer.c:1.91 --- php-src/ext/standard/var_unserializer.c:1.90 Mon Aug 6 18:30:53 2007 +++ php-src/ext/standard/var_unserializer.c Sat Sep 29 11:26:51 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c,v 1.90 2007/08/06 18:30:53 jani Exp $ */ +/* $Id: var_unserializer.c,v 1.91 2007/09/29 11:26:51 nlopess Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -388,7 +388,7 @@ } if (datalen < 0 || (*p) + datalen >= max) { - zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p)); + zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p))); return 0; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.69&r2=1.70&diff_format=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.69 php-src/ext/standard/var_unserializer.re:1.70 --- php-src/ext/standard/var_unserializer.re:1.69 Mon Aug 6 18:25:41 2007 +++ php-src/ext/standard/var_unserializer.re Sat Sep 29 11:26:51 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.re,v 1.69 2007/08/06 18:25:41 jani Exp $ */ +/* $Id: var_unserializer.re,v 1.70 2007/09/29 11:26:51 nlopess Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -392,7 +392,7 @@ } if (datalen < 0 || (*p) + datalen >= max) { - zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p)); + zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p))); return 0; } http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli_readline.c?r1=1.12&r2=1.13&diff_format=u Index: php-src/sapi/cli/php_cli_readline.c diff -u php-src/sapi/cli/php_cli_readline.c:1.12 php-src/sapi/cli/php_cli_readline.c:1.13 --- php-src/sapi/cli/php_cli_readline.c:1.12 Mon Jan 1 09:29:36 2007 +++ php-src/sapi/cli/php_cli_readline.c Sat Sep 29 11:26:51 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli_readline.c,v 1.12 2007/01/01 09:29:36 sebastian Exp $ */ +/* $Id: php_cli_readline.c,v 1.13 2007/09/29 11:26:51 nlopess Exp $ */ #include "php.h" @@ -423,7 +423,7 @@ - future: respect scope ("php > function foo() { $[tab]" should only expand to local variables...) */ - char *retval; + char *retval = NULL; int textlen = strlen(text); TSRMLS_FETCH();
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php