andrey Sun Sep 5 09:27:58 2004 EDT
Modified files:
/php-src/ext/standard file.c
Log:
remove "." at the end of messages
http://cvs.php.net/diff.php/php-src/ext/standard/file.c?r1=1.384&r2=1.385&ty=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.384 php-src/ext/standard/file.c:1.385
--- php-src/ext/standard/file.c:1.384 Thu Jul 22 08:12:28 2004
+++ php-src/ext/standard/file.c Sun Sep 5 09:27:58 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.384 2004/07/22 12:12:28 wez Exp $ */
+/* $Id: file.c,v 1.385 2004/09/05 13:27:58 andrey Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -540,7 +540,7 @@
if (Z_STRLEN_P(data)) {
numbytes = php_stream_write(stream, Z_STRVAL_P(data),
Z_STRLEN_P(data));
if (numbytes != Z_STRLEN_P(data)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Only %d of %d bytes written, possibly out of free disk space.", numbytes,
Z_STRLEN_P(data));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Only %d of %d bytes written, possibly out of free disk space", numbytes,
Z_STRLEN_P(data));
numbytes = -1;
}
}
@@ -563,9 +563,9 @@
bytes_written =
php_stream_write(stream, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
if (bytes_written < 0 || bytes_written
!= Z_STRLEN_PP(tmp)) {
if (bytes_written < 0) {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Failed to write %d bytes to %s.", Z_STRLEN_PP(tmp), filename);
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Failed to write %d bytes to %s", Z_STRLEN_PP(tmp), filename);
} else {
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space.",
bytes_written, Z_STRLEN_PP(tmp));
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Only %d of %d bytes written, possibly out of free disk space",
bytes_written, Z_STRLEN_PP(tmp));
}
numbytes = -1;
break;
@@ -577,7 +577,7 @@
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The 2nd parameter
should be either a string or an array.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The 2nd parameter
should be either a string or an array");
numbytes = -1;
break;
@@ -618,7 +618,7 @@
return;
}
if (flags < 0 || flags > (PHP_FILE_USE_INCLUDE_PATH |
PHP_FILE_IGNORE_NEW_LINES | PHP_FILE_SKIP_EMPTY_LINES | PHP_FILE_NO_DEFAULT_CONTEXT)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%ld' flag is not
supported.", flags);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%ld' flag is not
supported", flags);
RETURN_FALSE;
}
@@ -938,7 +938,7 @@
len = Z_LVAL_PP(arg2);
if (len <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter
must be greater than 0.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter
must be greater than 0");
RETURN_FALSE;
}
@@ -1045,7 +1045,7 @@
if (bytes != NULL) {
convert_to_long_ex(bytes);
if (Z_LVAL_PP(bytes) <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter
must be greater than 0.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter
must be greater than 0");
RETURN_FALSE;
}
@@ -1422,17 +1422,17 @@
wrapper = php_stream_locate_url_wrapper(old_name, NULL, 0 TSRMLS_CC);
if (!wrapper || !wrapper->wops) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate stream
wrapper.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to locate stream
wrapper");
RETURN_FALSE;
}
if (!wrapper->wops->rename) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s wrapper does not
support renaming.", wrapper->wops->label ? wrapper->wops->label : "Source");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s wrapper does not
support renaming", wrapper->wops->label ? wrapper->wops->label : "Source");
RETURN_FALSE;
}
if (wrapper != php_stream_locate_url_wrapper(new_name, NULL, 0 TSRMLS_CC)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot rename a file
across wrapper types.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot rename a file
across wrapper types");
RETURN_FALSE;
}
@@ -1660,7 +1660,7 @@
convert_to_long_ex(arg2);
len = Z_LVAL_PP(arg2);
if (len <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be
greater than 0.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be
greater than 0");
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
