fmk Sat Apr 29 14:53:26 2006 UTC
Modified files:
/php-src/ext/pdo pdo_dbh.c
/php-src/ext/standard exec.c ftp_fopen_wrapper.c
/php-src/sapi/cli php_cli.c
Log:
More ZSTR() fixes
http://cvs.php.net/viewcvs.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.127&r2=1.128&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.127 php-src/ext/pdo/pdo_dbh.c:1.128
--- php-src/ext/pdo/pdo_dbh.c:1.127 Thu Mar 23 19:03:30 2006
+++ php-src/ext/pdo/pdo_dbh.c Sat Apr 29 14:53:26 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.127 2006/03/23 19:03:30 tony2001 Exp $ */
+/* $Id: pdo_dbh.c,v 1.128 2006/04/29 14:53:26 fmk Exp $ */
/* The PDO Database Handle Class */
@@ -189,7 +189,7 @@
stream = php_stream_open_wrapper(uri, "rb", REPORT_ERRORS, NULL);
if (stream) {
- dsn = php_stream_get_line(stream, buf, buflen, NULL);
+ dsn = php_stream_get_line(stream, ZSTR(buf), buflen, NULL);
php_stream_close(stream);
}
return dsn;
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/exec.c?r1=1.118&r2=1.119&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.118 php-src/ext/standard/exec.c:1.119
--- php-src/ext/standard/exec.c:1.118 Wed Mar 8 00:43:28 2006
+++ php-src/ext/standard/exec.c Sat Apr 29 14:53:26 2006
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.118 2006/03/08 00:43:28 pajoye Exp $ */
+/* $Id: exec.c,v 1.119 2006/04/29 14:53:26 fmk Exp $ */
#include <stdio.h>
#include "php.h"
@@ -92,7 +92,7 @@
if (type != 3) {
b = buf;
- while (php_stream_get_line(stream, b, EXEC_INPUT_BUF, &bufl)) {
+ while (php_stream_get_line(stream, ZSTR(b), EXEC_INPUT_BUF,
&bufl)) {
/* no new line found, let's read some more */
if (b[bufl - 1] != '\n' && !php_stream_eof(stream)) {
if (buflen < (bufl + (b - buf) +
EXEC_INPUT_BUF)) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.90&r2=1.91&diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.90
php-src/ext/standard/ftp_fopen_wrapper.c:1.91
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.90 Mon Mar 20 14:10:23 2006
+++ php-src/ext/standard/ftp_fopen_wrapper.c Sat Apr 29 14:53:26 2006
@@ -18,7 +18,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.90 2006/03/20 14:10:23 tony2001 Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.91 2006/04/29 14:53:26 fmk Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -71,7 +71,7 @@
static inline int get_ftp_result(php_stream *stream, char *buffer, size_t
buffer_size TSRMLS_DC)
{
- while (php_stream_gets(stream, buffer, buffer_size-1) &&
+ while (php_stream_gets(stream, ZSTR(buffer), buffer_size-1) &&
!(isdigit((int) buffer[0]) && isdigit((int) buffer[1]) &&
isdigit((int) buffer[2]) && buffer[3] == ' '));
return strtol(buffer, NULL, 10);
@@ -595,7 +595,7 @@
return 0;
}
- if (!php_stream_get_line(innerstream, ent->d_name, sizeof(ent->d_name),
&tmp_len)) {
+ if (!php_stream_get_line(innerstream, ZSTR(ent->d_name),
sizeof(ent->d_name), &tmp_len)) {
return 0;
}
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cli/php_cli.c?r1=1.151&r2=1.152&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.151 php-src/sapi/cli/php_cli.c:1.152
--- php-src/sapi/cli/php_cli.c:1.151 Sat Apr 22 10:39:31 2006
+++ php-src/sapi/cli/php_cli.c Sat Apr 29 14:53:26 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_cli.c,v 1.151 2006/04/22 10:39:31 fmk Exp $ */
+/* $Id: php_cli.c,v 1.152 2006/04/29 14:53:26 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, 0)) != NULL) {
+ while (exit_status == SUCCESS &&
(input=php_stream_gets(s_in_process, NULL_ZSTR, 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
