cvs: php-src(PHP_5_2) /ext/standard file.c streamsfuncs.c

tony2001 Fri Jul 14 20:44:04 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard file.c streamsfuncs.c Log: rephrase the error message (fixes #38106) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.3&r2=1.409.2.6.2.4&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.3 php-src/ext/standard/file.c:1.409.2.6.2.4 --- php-src/ext/standard/file.c:1.409.2.6.2.3 Mon May 29 10:39:59 2006 +++ php-src/ext/standard/file.c Fri Jul 14 20:44:04 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.409.2.6.2.3 2006/05/29 10:39:59 tony2001 Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.4 2006/07/14 20:44:04 tony2001 Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -535,7 +535,7 @@ } if (offset > 0 && php_stream_seek(stream, offset, SEEK_SET) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to %ld position in the stream.", offset); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream.", offset); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.3&r2=1.58.2.6.2.4&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.3 php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.4 --- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.3 Wed Jul 12 12:38:49 2006 +++ php-src/ext/standard/streamsfuncs.c Fri Jul 14 20:44:04 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.58.2.6.2.3 2006/07/12 12:38:49 tony2001 Exp $ */ +/* $Id: streamsfuncs.c,v 1.58.2.6.2.4 2006/07/14 20:44:04 tony2001 Exp $ */ #include "php.h" #include "php_globals.h" @@ -404,7 +404,7 @@ php_stream_from_zval(stream, &zsrc); if (pos > 0 && php_stream_seek(stream, pos, SEEK_SET) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to %ld position in the stream.", pos); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream.", pos); RETURN_FALSE; } @@ -440,7 +440,7 @@ php_stream_from_zval(dest, &zdest); if (pos > 0 && php_stream_seek(src, pos, SEEK_SET) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to %ld position in the stream.", pos); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream.", pos); RETURN_FALSE; }