jani Sun Sep 30 05:40:24 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard string.c
Log:
- Nuked ending dots from error messages
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.69&r2=1.445.2.14.2.69.2.1&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.69
php-src/ext/standard/string.c:1.445.2.14.2.69.2.1
--- php-src/ext/standard/string.c:1.445.2.14.2.69 Fri Sep 7 18:23:58 2007
+++ php-src/ext/standard/string.c Sun Sep 30 05:40:23 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.69 2007/09/07 18:23:58 pajoye Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.69.2.1 2007/09/30 05:40:23 jani Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -511,22 +511,22 @@
/* Error, try to be as helpful as possible:
(a range ending/starting with '.' won't be captured
here) */
if (end-len >= input) { /* there was no 'left' char */
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid '..'-range, no character to the left of '..'.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid '..'-range, no character to the left of '..'");
result = FAILURE;
continue;
}
if (input+2 >= end) { /* there is no 'right' char */
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid '..'-range, no character to the right of '..'.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid '..'-range, no character to the right of '..'");
result = FAILURE;
continue;
}
if (input[-1] > input[2]) { /* wrong order */
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid '..'-range, '..'-range needs to be incrementing.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid '..'-range, '..'-range needs to be incrementing");
result = FAILURE;
continue;
}
/* FIXME: better error (a..b..c is the only left
possibility?) */
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
'..'-range.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
'..'-range");
result = FAILURE;
continue;
} else {
@@ -861,7 +861,7 @@
}
if (! Z_STRLEN_PP(delim)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter");
RETURN_FALSE;
}
@@ -988,7 +988,7 @@
if (argc == 1) {
if (Z_TYPE_PP(arg1) != IS_ARRAY) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument
to implode must be an array.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Argument
to implode must be an array");
return;
}
@@ -1008,7 +1008,7 @@
convert_to_string_ex(arg1);
delim = *arg1;
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad
arguments.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad
arguments");
return;
}
}
@@ -1544,7 +1544,7 @@
if (Z_TYPE_PP(needle) == IS_STRING) {
if (!Z_STRLEN_PP(needle)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty
delimiter.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty
delimiter");
efree(haystack_orig);
RETURN_FALSE;
}
@@ -1592,7 +1592,7 @@
if (Z_TYPE_PP(needle) == IS_STRING) {
if (!Z_STRLEN_PP(needle)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty
delimiter.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty
delimiter");
RETURN_FALSE;
}
@@ -1645,13 +1645,13 @@
}
if (offset < 0 || offset > Z_STRLEN_PP(haystack)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not
contained in string.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not
contained in string");
RETURN_FALSE;
}
if (Z_TYPE_PP(needle) == IS_STRING) {
if (!Z_STRLEN_PP(needle)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty
delimiter.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty
delimiter");
RETURN_FALSE;
}
@@ -1695,7 +1695,7 @@
}
if (offset < 0 || offset > haystack_len) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not
contained in string.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset not
contained in string");
RETURN_FALSE;
}
@@ -1725,7 +1725,7 @@
needle_char[0] = tolower((char)
Z_DVAL_P(needle));
break;
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"needle is not a string or an integer.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"needle is not a string or an integer");
efree(haystack_dup);
RETURN_FALSE;
break;
@@ -2038,7 +2038,7 @@
}
if (chunklen <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Chunk length
should be greater than zero.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Chunk length
should be greater than zero");
RETURN_FALSE;
}
@@ -2253,7 +2253,7 @@
result[result_len] = '\0';
RETURN_STRINGL(result, result_len, 0);
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Functionality of 'from' and 'len' as arrays is not implemented.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Functionality of 'from' and 'len' as arrays is not implemented");
RETURN_STRINGL(Z_STRVAL_PP(str), Z_STRLEN_PP(str), 1);
}
} else { /* str is array of strings */
@@ -2646,7 +2646,7 @@
}
if (ac == 2 && Z_TYPE_PP(from) != IS_ARRAY) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second
argument is not an array.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The second
argument is not an array");
RETURN_FALSE;
}
@@ -3951,7 +3951,7 @@
cat = Z_LVAL_PP(pcategory);
} else { /* FIXME: The following behaviour should be removed. */
char *category;
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passing locale
category name as string is deprecated. Use the LC_* -constants instead.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Passing locale
category name as string is deprecated. Use the LC_* -constants instead");
convert_to_string_ex(pcategory);
category = Z_STRVAL_P(*pcategory);
@@ -3972,7 +3972,7 @@
else if (!strcasecmp ("LC_TIME", category))
cat = LC_TIME;
else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE,
LC_MONETARY, LC_NUMERIC, or LC_TIME.", category);
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
locale category name %s, must be one of LC_ALL, LC_COLLATE, LC_CTYPE,
LC_MONETARY, LC_NUMERIC, or LC_TIME", category);
efree(args);
RETURN_FALSE;
}
@@ -4411,7 +4411,7 @@
convert_to_long_ex(mult);
if (Z_LVAL_PP(mult) < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second argument
has to be greater than or equal to 0.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Second argument
has to be greater than or equal to 0");
return;
}
@@ -4475,7 +4475,7 @@
mymode = Z_LVAL_PP(mode);
if (mymode < 0 || mymode > 4) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
mode.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown
mode");
RETURN_FALSE;
}
}
@@ -4666,7 +4666,7 @@
convert_to_string_ex(needle);
if (Z_STRLEN_PP(needle) == 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty substring.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty substring");
RETURN_FALSE;
}
@@ -4676,12 +4676,12 @@
if (ac > 2) {
convert_to_long_ex(offset);
if (Z_LVAL_PP(offset) < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset
should be greater than or equal to 0.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset
should be greater than or equal to 0");
RETURN_FALSE;
}
if (Z_LVAL_PP(offset) > Z_STRLEN_PP(haystack)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset
value %ld exceeds string length.", Z_LVAL_PP(offset));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset
value %ld exceeds string length", Z_LVAL_PP(offset));
RETURN_FALSE;
}
p += Z_LVAL_PP(offset);
@@ -4689,11 +4689,11 @@
if (ac == 4) {
convert_to_long_ex(length);
if (Z_LVAL_PP(length) <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Length should be greater than 0.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Length should be greater than 0");
RETURN_FALSE;
}
if (Z_LVAL_PP(length) > (Z_STRLEN_PP(haystack) -
Z_LVAL_PP(offset))) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Length value %ld exceeds string length.", Z_LVAL_PP(length));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Length value %ld exceeds string length", Z_LVAL_PP(length));
RETURN_FALSE;
}
endp = p + Z_LVAL_PP(length);
@@ -4759,7 +4759,7 @@
if (ZEND_NUM_ARGS() > 2) {
convert_to_string_ex(pad_string);
if (Z_STRLEN_PP(pad_string) == 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding
string cannot be empty.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Padding
string cannot be empty");
return;
}
pad_str_val = Z_STRVAL_PP(pad_string);
@@ -4769,7 +4769,7 @@
convert_to_long_ex(pad_type);
pad_type_val = Z_LVAL_PP(pad_type);
if (pad_type_val < STR_PAD_LEFT || pad_type_val >
STR_PAD_BOTH) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Padding type has to be STR_PAD_LEFT, STR_PAD_RIGHT, or STR_PAD_BOTH");
return;
}
}
@@ -5053,7 +5053,7 @@
}
if (split_length <= 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length of each
segment must be greater than zero.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The length of each
segment must be greater than zero");
RETURN_FALSE;
}
@@ -5091,7 +5091,7 @@
}
if (!char_list_len) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The character list
cannot be empty.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The character list
cannot be empty");
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
