cvs: php-src /ext/pgsql pgsql.c /ext/standard file.c streamsfuncs.c

felipe Mon Sep 8 01:30:56 2008 UTC Modified files: /php-src/ext/standard streamsfuncs.c file.c /php-src/ext/pgsql pgsql.c Log: - Fixed some wrong format parameters http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.121&r2=1.122&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.121 php-src/ext/standard/streamsfuncs.c:1.122 --- php-src/ext/standard/streamsfuncs.c:1.121 Sat Aug 16 10:57:26 2008 +++ php-src/ext/standard/streamsfuncs.c Mon Sep 8 01:30:55 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.121 2008/08/16 10:57:26 bjori Exp $ */ +/* $Id: streamsfuncs.c,v 1.122 2008/09/08 01:30:55 felipe Exp $ */ #include "php.h" #include "php_globals.h" @@ -94,7 +94,7 @@ RETVAL_FALSE; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|zzd!lr", &host, &host_len, &zerrno, &zerrstr, &timeout, &flags, &zcontext) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|zzdlr", &host, &host_len, &zerrno, &zerrstr, &timeout, &flags, &zcontext) == FAILURE) { RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.525&r2=1.526&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.525 php-src/ext/standard/file.c:1.526 --- php-src/ext/standard/file.c:1.525 Tue Aug 12 19:38:04 2008 +++ php-src/ext/standard/file.c Mon Sep 8 01:30:55 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.525 2008/08/12 19:38:04 felipe Exp $ */ +/* $Id: file.c,v 1.526 2008/09/08 01:30:55 felipe Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2132,7 +2132,7 @@ zval *zstream; zend_uchar delimiter_free = 0, enclosure_free = 0, escape_free = 0; - if (zend_parse_parameters(argc TSRMLS_CC, "r|l!ttt", &zstream, &len, + if (zend_parse_parameters(argc TSRMLS_CC, "r|lttt", &zstream, &len, &delimiter, &delimiter_len, &delimiter_type, &enclosure, &enclosure_len, &enclosure_type, &escape, &escape_len, &escape_type) == FAILURE) { http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.384&r2=1.385&diff_format=u Index: php-src/ext/pgsql/pgsql.c diff -u php-src/ext/pgsql/pgsql.c:1.384 php-src/ext/pgsql/pgsql.c:1.385 --- php-src/ext/pgsql/pgsql.c:1.384 Sun Aug 3 12:12:39 2008 +++ php-src/ext/pgsql/pgsql.c Mon Sep 8 01:30:55 2008 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.384 2008/08/03 12:12:39 jani Exp $ */ +/* $Id: pgsql.c,v 1.385 2008/09/08 01:30:55 felipe Exp $ */ #include <stdlib.h> @@ -2213,7 +2213,7 @@ char *table_name; zend_rsrc_list_entry *field_table; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|b!", &result, &fnum, &return_oid) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|b", &result, &fnum, &return_oid) == FAILURE) { return; } @@ -3950,7 +3950,7 @@ ExecStatusType status; int argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "rs/a|ss", + if (zend_parse_parameters(argc TSRMLS_CC, "rsa|ss", &pgsql_link, &table_name, &table_name_len, &pg_rows, &pg_delim, &pg_delim_len, &pg_null_as, &pg_null_as_len) == FAILURE) { return;