jani Sun Sep 30 05:43:28 2007 UTC
Modified files:
/php-src/ext/standard formatted_print.c ftp_fopen_wrapper.c
http_fopen_wrapper.c
Log:
- Nuked ending dots in error messages
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.102&r2=1.103&diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.102
php-src/ext/standard/formatted_print.c:1.103
--- php-src/ext/standard/formatted_print.c:1.102 Fri Jul 13 15:52:38 2007
+++ php-src/ext/standard/formatted_print.c Sun Sep 30 05:43:28 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: formatted_print.c,v 1.102 2007/07/13 15:52:38 tony2001 Exp $ */
+/* $Id: formatted_print.c,v 1.103 2007/09/30 05:43:28 jani Exp $ */
#include <math.h> /* modf() */
#include "php.h"
@@ -735,7 +735,7 @@
if (argnum <= 0) {
efree(result);
efree(args);
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Argument number must be greater than zero.");
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Argument number must be greater than zero");
return NULL;
}
@@ -777,7 +777,7 @@
if ((width =
php_sprintf_getnumber(format, &inpos)) < 0) {
efree(result);
efree(args);
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Width must be greater than zero and less than %d.",
INT_MAX);
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Width must be greater than zero and less than %d",
INT_MAX);
return NULL;
}
adjusting |= ADJ_WIDTH;
@@ -794,7 +794,7 @@
if ((precision =
php_sprintf_getnumber(format, &inpos)) < 0) {
efree(result);
efree(args);
- php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Precision must be greater than zero and less than %d.",
INT_MAX);
+ php_error_docref(NULL
TSRMLS_CC, E_WARNING, "Precision must be greater than zero and less than %d",
INT_MAX);
return NULL;
}
adjusting |= ADJ_PRECISION;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/ftp_fopen_wrapper.c?r1=1.98&r2=1.99&diff_format=u
Index: php-src/ext/standard/ftp_fopen_wrapper.c
diff -u php-src/ext/standard/ftp_fopen_wrapper.c:1.98
php-src/ext/standard/ftp_fopen_wrapper.c:1.99
--- php-src/ext/standard/ftp_fopen_wrapper.c:1.98 Thu Sep 27 13:16:09 2007
+++ php-src/ext/standard/ftp_fopen_wrapper.c Sun Sep 30 05:43:28 2007
@@ -18,7 +18,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.98 2007/09/27 13:16:09 jani Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.99 2007/09/30 05:43:28 jani Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -412,7 +412,7 @@
}
if (strpbrk(mode, "wa+")) {
if (read_write) {
- php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, "FTP does not support simultaneous read/write connections.");
+ php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, "FTP does not support simultaneous read/write connections");
return NULL;
}
if (strchr(mode, 'a')) {
@@ -423,7 +423,7 @@
}
if (!read_write) {
/* No mode specified? */
- php_stream_wrapper_log_error(wrapper, options TSRMLS_CC,
"Unknown file open mode.");
+ php_stream_wrapper_log_error(wrapper, options TSRMLS_CC,
"Unknown file open mode");
return NULL;
}
@@ -486,7 +486,7 @@
goto errexit;
}
} else {
- php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, "Remote file already exists and overwrite context option not
specified.");
+ php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, "Remote file already exists and overwrite context option not
specified");
errno = EEXIST;
goto errexit;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/http_fopen_wrapper.c?r1=1.127&r2=1.128&diff_format=u
Index: php-src/ext/standard/http_fopen_wrapper.c
diff -u php-src/ext/standard/http_fopen_wrapper.c:1.127
php-src/ext/standard/http_fopen_wrapper.c:1.128
--- php-src/ext/standard/http_fopen_wrapper.c:1.127 Sat Jul 14 08:38:19 2007
+++ php-src/ext/standard/http_fopen_wrapper.c Sun Sep 30 05:43:28 2007
@@ -19,7 +19,7 @@
| Sara Golemon <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.127 2007/07/14 08:38:19 tony2001 Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.128 2007/09/30 05:43:28 jani Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -180,7 +180,7 @@
/* Normal http request (possibly with proxy) */
if (strpbrk(mode, "awx+")) {
- php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, "HTTP wrapper does not support writeable connections.");
+ php_stream_wrapper_log_error(wrapper, options
TSRMLS_CC, "HTTP wrapper does not support writeable connections");
php_url_free(resource);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
