diff options
author | Jani Taskinen <jani@php.net> | 2007-09-30 05:49:45 +0000 |
---|---|---|
committer | Jani Taskinen <jani@php.net> | 2007-09-30 05:49:45 +0000 |
commit | 6723ed1db3c32a55ed2fb63ff9bf9405220d0a2e (patch) | |
tree | 550290c29275bd2cbe31400d6cde53c53dc6a1fd /ext | |
parent | adae5131f37a9d925f5a5fcf107572de3ef784b2 (diff) | |
download | php-git-6723ed1db3c32a55ed2fb63ff9bf9405220d0a2e.tar.gz |
MFH: Nuked ending dots from error messages
Diffstat (limited to 'ext')
-rw-r--r-- | ext/standard/browscap.c | 2 | ||||
-rw-r--r-- | ext/standard/exec.c | 2 | ||||
-rw-r--r-- | ext/standard/filters.c | 2 | ||||
-rw-r--r-- | ext/standard/formatted_print.c | 6 | ||||
-rw-r--r-- | ext/standard/ftp_fopen_wrapper.c | 6 | ||||
-rw-r--r-- | ext/standard/http.c | 4 | ||||
-rw-r--r-- | ext/standard/http_fopen_wrapper.c | 2 | ||||
-rw-r--r-- | ext/standard/image.c | 3 | ||||
-rw-r--r-- | ext/standard/mail.c | 2 | ||||
-rw-r--r-- | ext/standard/php_fopen_wrapper.c | 2 | ||||
-rw-r--r-- | ext/standard/streamsfuncs.c | 18 | ||||
-rw-r--r-- | ext/standard/uniqid.c | 2 | ||||
-rw-r--r-- | ext/standard/url.c | 2 | ||||
-rw-r--r-- | ext/standard/uuencode.c | 2 |
14 files changed, 27 insertions, 28 deletions
diff --git a/ext/standard/browscap.c b/ext/standard/browscap.c index 1d68ad141d..9737007974 100644 --- a/ext/standard/browscap.c +++ b/ext/standard/browscap.c @@ -318,7 +318,7 @@ PHP_FUNCTION(get_browser) char *browscap = INI_STR("browscap"); if (!browscap || !browscap[0]) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "browscap ini directive not set."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "browscap ini directive not set"); RETURN_FALSE; } diff --git a/ext/standard/exec.c b/ext/standard/exec.c index 12103c2190..71cc2ea899 100644 --- a/ext/standard/exec.c +++ b/ext/standard/exec.c @@ -463,7 +463,7 @@ PHP_FUNCTION(proc_nice) errno = 0; nice(pri); if (errno) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may attempt to increase the priority of a process."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Only a super user may attempt to increase the priority of a process"); RETURN_FALSE; } diff --git a/ext/standard/filters.c b/ext/standard/filters.c index e54f08c5f8..5dd3dc6406 100644 --- a/ext/standard/filters.c +++ b/ext/standard/filters.c @@ -1880,7 +1880,7 @@ static php_stream_filter *consumed_filter_create(const char *filtername, zval *f /* Create this filter */ data = pecalloc(1, sizeof(php_consumed_filter_data), persistent); if (!data) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes.", sizeof(php_consumed_filter_data)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed allocating %zd bytes", sizeof(php_consumed_filter_data)); return NULL; } data->persistent = persistent; diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index feec9bdddf..fadd7969b0 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -445,7 +445,7 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC 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; } @@ -487,7 +487,7 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC 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; @@ -504,7 +504,7 @@ php_formatted_print(int ht, int *len, int use_array, int format_offset TSRMLS_DC 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; diff --git a/ext/standard/ftp_fopen_wrapper.c b/ext/standard/ftp_fopen_wrapper.c index 2a64528bcf..b484b6b151 100644 --- a/ext/standard/ftp_fopen_wrapper.c +++ b/ext/standard/ftp_fopen_wrapper.c @@ -412,7 +412,7 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch } 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 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch } 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 @@ php_stream * php_stream_url_wrap_ftp(php_stream_wrapper *wrapper, char *path, ch 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; } diff --git a/ext/standard/http.c b/ext/standard/http.c index 02733aadd1..80f458c156 100644 --- a/ext/standard/http.c +++ b/ext/standard/http.c @@ -76,7 +76,7 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr, } if (zend_hash_get_current_data_ex(ht, (void **)&zdata, NULL) == FAILURE || !zdata || !(*zdata)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error traversing form data array"); return FAILURE; } if (Z_TYPE_PP(zdata) == IS_ARRAY || Z_TYPE_PP(zdata) == IS_OBJECT) { @@ -203,7 +203,7 @@ PHP_FUNCTION(http_build_query) } if (Z_TYPE_P(formdata) != IS_ARRAY && Z_TYPE_P(formdata) != IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter 1 expected to be Array or Object. Incorrect value given"); RETURN_FALSE; } diff --git a/ext/standard/http_fopen_wrapper.c b/ext/standard/http_fopen_wrapper.c index 25aabab7be..f3acdb2981 100644 --- a/ext/standard/http_fopen_wrapper.c +++ b/ext/standard/http_fopen_wrapper.c @@ -137,7 +137,7 @@ php_stream *php_stream_url_wrap_http_ex(php_stream_wrapper *wrapper, char *path, /* 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; } diff --git a/ext/standard/image.c b/ext/standard/image.c index 9e95928686..7c4e5f4c1d 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -1317,8 +1317,7 @@ PHP_FUNCTION(getimagesize) #if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB) result = php_handle_swc(stream TSRMLS_CC); #else - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled."); - + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "The image is a compressed SWF file, but you do not have a static version of the zlib extension enabled"); #endif break; case IMAGE_FILETYPE_PSD: diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 608350f555..d9e246b091 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -98,7 +98,7 @@ PHP_FUNCTION(mail) char *p, *e; if (PG(safe_mode) && (ZEND_NUM_ARGS() == 5)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect. The fifth parameter is disabled in SAFE MODE."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "SAFE MODE Restriction in effect. The fifth parameter is disabled in SAFE MODE"); RETURN_FALSE; } diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c index 52fb11f5a7..2c4e0176b3 100644 --- a/ext/standard/php_fopen_wrapper.c +++ b/ext/standard/php_fopen_wrapper.c @@ -253,7 +253,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, char *path, ch pathdup = estrndup(path + 6, strlen(path + 6)); p = strstr(pathdup, "/resource="); if (!p) { - php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "No URL resource specified."); + php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "No URL resource specified"); efree(pathdup); return NULL; } diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 5d3abca2ce..963cecc0fb 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -357,7 +357,7 @@ PHP_FUNCTION(stream_socket_recvfrom) } if (to_read <= 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; } @@ -406,7 +406,7 @@ PHP_FUNCTION(stream_get_contents) 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 position %ld in the stream.", pos); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", pos); RETURN_FALSE; } @@ -442,7 +442,7 @@ PHP_FUNCTION(stream_copy_to_stream) 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 position %ld in the stream.", pos); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to seek to position %ld in the stream", pos); RETURN_FALSE; } @@ -757,10 +757,10 @@ PHP_FUNCTION(stream_select) convert_to_long_ex(sec); if (Z_LVAL_PP(sec) < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds parameter must be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The seconds parameter must be greater than 0"); RETURN_FALSE; } else if (usec < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The microseconds parameter must be greater than 0."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The microseconds parameter must be greater than 0"); RETURN_FALSE; } @@ -945,7 +945,7 @@ PHP_FUNCTION(stream_context_get_options) } context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -975,7 +975,7 @@ PHP_FUNCTION(stream_context_set_option) /* figure out where the context is coming from exactly */ context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -1002,7 +1002,7 @@ PHP_FUNCTION(stream_context_set_params) context = decode_context_param(zcontext TSRMLS_CC); if (!context) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid stream/context parameter"); RETURN_FALSE; } @@ -1186,7 +1186,7 @@ PHP_FUNCTION(stream_get_line) } if (max_length < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The maximum allowed length must be greater than or equal to zero."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The maximum allowed length must be greater than or equal to zero"); RETURN_FALSE; } if (!max_length) { diff --git a/ext/standard/uniqid.c b/ext/standard/uniqid.c index b9888e4c10..7892417655 100644 --- a/ext/standard/uniqid.c +++ b/ext/standard/uniqid.c @@ -61,7 +61,7 @@ PHP_FUNCTION(uniqid) #if HAVE_USLEEP && !defined(PHP_WIN32) if (!more_entropy) { #if defined(__CYGWIN__) - php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must use 'more entropy' under CYGWIN."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "You must use 'more entropy' under CYGWIN"); RETURN_FALSE; #else usleep(1); diff --git a/ext/standard/url.c b/ext/standard/url.c index 33ef6b32fe..cbfd151f8b 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -375,7 +375,7 @@ PHP_FUNCTION(parse_url) if (resource->fragment != NULL) RETVAL_STRING(resource->fragment, 1); break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier %ld.", key); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid URL component identifier %ld", key); RETVAL_FALSE; } goto done; diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c index 9a54fe6c08..218ba1496b 100644 --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@ -215,7 +215,7 @@ PHP_FUNCTION(convert_uudecode) dst_len = php_uudecode(src, src_len, &dst); if (dst_len < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The given parameter is not a valid uuencoded string."); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "The given parameter is not a valid uuencoded string"); RETURN_FALSE; } |