fmk Sat Apr 22 10:39:31 2006 UTC Modified files: /php-src/ext/standard file.c image.c /php-src/ext/spl spl_directory.c /php-src/sapi/cli php_cli.c Log: Fix Win32 build. NULL_ZSTR was converted to ZSTR(NULL_ZSTR) http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.437&r2=1.438&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.437 php-src/ext/standard/file.c:1.438 --- php-src/ext/standard/file.c:1.437 Tue Apr 18 19:10:12 2006 +++ php-src/ext/standard/file.c Sat Apr 22 10:39:30 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.437 2006/04/18 19:10:12 pollita Exp $ */ +/* $Id: file.c,v 1.438 2006/04/22 10:39:30 fmk Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1049,7 +1049,7 @@ php_stream_from_zval(stream, &zstream); - buf.v = php_stream_get_line_ex(stream, stream->readbuf_type, NULL_ZSTR, 0, length, &retlen); + buf.v = php_stream_get_line_ex(stream, stream->readbuf_type, NULL, 0, length, &retlen); if (!buf.v) { RETURN_FALSE; } @@ -1110,7 +1110,7 @@ php_stream_from_zval(stream, &zstream); if (stream->readbuf_type == IS_UNICODE) { - UChar *buf = php_stream_get_line_ex(stream, IS_UNICODE, NULL_ZSTR, 0, length, &retlen); + UChar *buf = php_stream_get_line_ex(stream, IS_UNICODE, NULL, 0, length, &retlen); UChar *allowed = NULL; int allowed_len = 0; @@ -1127,7 +1127,7 @@ RETURN_UNICODEL(buf, retlen, 0); } else { /* IS_STRING */ - char *buf = php_stream_get_line_ex(stream, IS_STRING, NULL_ZSTR, 0, length, &retlen); + char *buf = php_stream_get_line_ex(stream, IS_STRING, NULL, 0, length, &retlen); char *allowed = NULL; int allowed_len = 0; @@ -1189,7 +1189,7 @@ } - buf = php_stream_get_line((php_stream *) what, NULL_ZSTR, 0, &len); + buf = php_stream_get_line((php_stream *) what, NULL, 0, &len); if (buf == NULL) { efree(args); RETURN_FALSE; @@ -2056,7 +2056,7 @@ } if (len < 0) { - if ((buf = php_stream_get_line(stream, NULL_ZSTR, 0, &buf_len)) == NULL) { + if ((buf = php_stream_get_line(stream, NULL, 0, &buf_len)) == NULL) { RETURN_FALSE; } } else { @@ -2153,7 +2153,7 @@ memcpy(tptr, line_end, line_end_len); tptr += line_end_len; - if ((new_buf = php_stream_get_line(stream, NULL_ZSTR, 0, &new_len)) == NULL) { + if ((new_buf = php_stream_get_line(stream, NULL, 0, &new_len)) == NULL) { /* we've got an unterminated enclosure, * assign all the data from the start of * the enclosure to end of data to the http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/image.c?r1=1.121&r2=1.122&diff_format=u Index: php-src/ext/standard/image.c diff -u php-src/ext/standard/image.c:1.121 php-src/ext/standard/image.c:1.122 --- php-src/ext/standard/image.c:1.121 Fri Mar 17 22:52:55 2006 +++ php-src/ext/standard/image.c Sat Apr 22 10:39:30 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.121 2006/03/17 22:52:55 andrei Exp $ */ +/* $Id: image.c,v 1.122 2006/04/22 10:39:30 fmk Exp $ */ #include "php.h" #include <stdio.h> @@ -1023,7 +1023,7 @@ if (php_stream_rewind(stream)) { return 0; } - while ((fline=php_stream_gets(stream, NULL_ZSTR, 0)) != NULL) { + while ((fline=php_stream_gets(stream, NULL, 0)) != NULL) { iname = estrdup(fline); /* simple way to get necessary buffer of required size */ if (sscanf(fline, "#define %s %d", iname, &value) == 2) { if (!(type = strrchr(iname, '_'))) { http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_directory.c?r1=1.89&r2=1.90&diff_format=u Index: php-src/ext/spl/spl_directory.c diff -u php-src/ext/spl/spl_directory.c:1.89 php-src/ext/spl/spl_directory.c:1.90 --- php-src/ext/spl/spl_directory.c:1.89 Thu Apr 6 19:11:06 2006 +++ php-src/ext/spl/spl_directory.c Sat Apr 22 10:39:30 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: spl_directory.c,v 1.89 2006/04/06 19:11:06 tony2001 Exp $ */ +/* $Id: spl_directory.c,v 1.90 2006/04/22 10:39:30 fmk Exp $ */ #ifdef HAVE_CONFIG_H # include "config.h" @@ -1356,7 +1356,7 @@ buf[line_len] = '\0'; } } else { - buf = php_stream_get_line(intern->u.file.stream, NULL_ZSTR, 0, &line_len); + buf = php_stream_get_line(intern->u.file.stream, NULL, 0, &line_len); } if (!buf) { http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.150&r2=1.151&diff_format=u Index: php-src/sapi/cli/php_cli.c diff -u php-src/sapi/cli/php_cli.c:1.150 php-src/sapi/cli/php_cli.c:1.151 --- php-src/sapi/cli/php_cli.c:1.150 Fri Mar 17 22:52:55 2006 +++ php-src/sapi/cli/php_cli.c Sat Apr 22 10:39:31 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_cli.c,v 1.150 2006/03/17 22:52:55 andrei Exp $ */ +/* $Id: php_cli.c,v 1.151 2006/04/22 10:39:31 fmk Exp $ */ #include "php.h" #include "php_globals.h" @@ -1146,7 +1146,7 @@ Z_LVAL_P(argi) = index; INIT_PZVAL(argi); zend_hash_update(&EG(symbol_table), "argi", sizeof("argi"), &argi, sizeof(zval *), NULL); - while (exit_status == SUCCESS && (input=php_stream_gets(s_in_process, NULL_ZSTR, 0)) != NULL) { + while (exit_status == SUCCESS && (input=php_stream_gets(s_in_process, NULL, 0)) != NULL) { len = strlen(input); while (len-- && (input[len]=='\n' || input[len]=='\r')) { input[len] = '\0';
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php