tony2001 Mon Apr 3 09:14:34 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/ftp ftp.c
/php-src/ext/mhash mhash.c
/php-src/ext/soap php_encoding.c
/php-src/ext/standard streamsfuncs.c string.c basic_functions.c
Log:
fix spelling in error messages:
greater/less thEn -> greater/less thAn
http://cvs.php.net/viewcvs.cgi/php-src/ext/ftp/ftp.c?r1=1.112.2.3&r2=1.112.2.4&diff_format=u
Index: php-src/ext/ftp/ftp.c
diff -u php-src/ext/ftp/ftp.c:1.112.2.3 php-src/ext/ftp/ftp.c:1.112.2.4
--- php-src/ext/ftp/ftp.c:1.112.2.3 Sun Jan 1 12:50:06 2006
+++ php-src/ext/ftp/ftp.c Mon Apr 3 09:14:33 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ftp.c,v 1.112.2.3 2006/01/01 12:50:06 sniper Exp $ */
+/* $Id: ftp.c,v 1.112.2.4 2006/04/03 09:14:33 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -810,7 +810,7 @@
if (resumepos > 0) {
if (resumepos > 2147483647) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot
handle files greater then 2147483647 bytes.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot
handle files greater than 2147483647 bytes.");
goto bail;
}
sprintf(arg, "%u", resumepos);
@@ -907,7 +907,7 @@
if (startpos > 0) {
if (startpos > 2147483647) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot
handle files with a size greater then 2147483647 bytes.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot
handle files with a size greater than 2147483647 bytes.");
goto bail;
}
sprintf(arg, "%u", startpos);
@@ -1706,7 +1706,7 @@
* since php is 32 bit by design, we bail out with warning
*/
if (resumepos > 2147483647) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot
handle files greater then 2147483648 bytes.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot
handle files greater than 2147483648 bytes.");
goto bail;
}
sprintf(arg, "%u", resumepos);
@@ -1824,7 +1824,7 @@
}
if (startpos > 0) {
if (startpos > 2147483647) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot
handle files with a size greater then 2147483647 bytes.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "PHP cannot
handle files with a size greater than 2147483647 bytes.");
goto bail;
}
sprintf(arg, "%u", startpos);
http://cvs.php.net/viewcvs.cgi/php-src/ext/mhash/mhash.c?r1=1.48.2.2&r2=1.48.2.3&diff_format=u
Index: php-src/ext/mhash/mhash.c
diff -u php-src/ext/mhash/mhash.c:1.48.2.2 php-src/ext/mhash/mhash.c:1.48.2.3
--- php-src/ext/mhash/mhash.c:1.48.2.2 Sun Jan 1 12:50:09 2006
+++ php-src/ext/mhash/mhash.c Mon Apr 3 09:14:33 2006
@@ -16,7 +16,7 @@
| Nikos Mavroyanopoulos <[EMAIL PROTECTED]> (HMAC, KEYGEN) |
+----------------------------------------------------------------------+
*/
-/* $Id: mhash.c,v 1.48.2.2 2006/01/01 12:50:09 sniper Exp $ */
+/* $Id: mhash.c,v 1.48.2.3 2006/04/03 09:14:33 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -205,7 +205,7 @@
WRONG_PARAM_COUNT;
}
if (bytes <= 0){
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "the byte parameter
must be greater then 0");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "the byte parameter
must be greater than 0");
RETURN_FALSE;
}
http://cvs.php.net/viewcvs.cgi/php-src/ext/soap/php_encoding.c?r1=1.103.2.17&r2=1.103.2.18&diff_format=u
Index: php-src/ext/soap/php_encoding.c
diff -u php-src/ext/soap/php_encoding.c:1.103.2.17
php-src/ext/soap/php_encoding.c:1.103.2.18
--- php-src/ext/soap/php_encoding.c:1.103.2.17 Fri Mar 3 09:20:33 2006
+++ php-src/ext/soap/php_encoding.c Mon Apr 3 09:14:33 2006
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_encoding.c,v 1.103.2.17 2006/03/03 09:20:33 dmitry Exp $ */
+/* $Id: php_encoding.c,v 1.103.2.18 2006/04/03 09:14:33 tony2001 Exp $ */
#include <time.h>
@@ -2878,11 +2878,11 @@
}
if (type->restrictions->minLength &&
strlen(data->children->content) <
type->restrictions->minLength->value) {
- soap_error0(E_WARNING, "Encoding: Restriction: length less
then 'minLength'");
+ soap_error0(E_WARNING, "Encoding: Restriction: length less
than 'minLength'");
}
if (type->restrictions->maxLength &&
strlen(data->children->content) >
type->restrictions->maxLength->value) {
- soap_error0(E_WARNING, "Encoding: Restriction: length greater
then 'maxLength'");
+ soap_error0(E_WARNING, "Encoding: Restriction: length greater
than 'maxLength'");
}
if (type->restrictions->length &&
strlen(data->children->content) !=
type->restrictions->length->value) {
@@ -2941,11 +2941,11 @@
}
if (type->restrictions->minLength &&
Z_STRLEN_P(data) <
type->restrictions->minLength->value) {
- soap_error0(E_WARNING, "Encoding: Restriction: length
less then 'minLength'");
+ soap_error0(E_WARNING, "Encoding: Restriction: length
less than 'minLength'");
}
if (type->restrictions->maxLength &&
Z_STRLEN_P(data) >
type->restrictions->maxLength->value) {
- soap_error0(E_WARNING, "Encoding: Restriction: length
greater then 'maxLength'");
+ soap_error0(E_WARNING, "Encoding: Restriction: length
greater than 'maxLength'");
}
if (type->restrictions->length &&
Z_STRLEN_P(data) !=
type->restrictions->length->value) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.3&r2=1.58.2.4&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.3
php-src/ext/standard/streamsfuncs.c:1.58.2.4
--- php-src/ext/standard/streamsfuncs.c:1.58.2.3 Thu Feb 23 18:28:07 2006
+++ php-src/ext/standard/streamsfuncs.c Mon Apr 3 09:14:33 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.3 2006/02/23 18:28:07 iliaa Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.4 2006/04/03 09:14:33 tony2001 Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -753,10 +753,10 @@
convert_to_long(sec);
if (sec < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The
seconds parameter must be greater then 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 then 0.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "The
microseconds parameter must be greater than 0.");
RETURN_FALSE;
}
@@ -1181,7 +1181,7 @@
}
if (max_length < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "The maximum
allowed length must be greater then 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) {
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.445.2.12&r2=1.445.2.13&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.12
php-src/ext/standard/string.c:1.445.2.13
--- php-src/ext/standard/string.c:1.445.2.12 Tue Mar 14 15:15:22 2006
+++ php-src/ext/standard/string.c Mon Apr 3 09:14:33 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.12 2006/03/14 15:15:22 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.13 2006/04/03 09:14:33 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4474,7 +4474,7 @@
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 then or equal to 0.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Offset
should be greater than or equal to 0.");
RETURN_FALSE;
}
p += Z_LVAL_PP(offset);
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.29&r2=1.725.2.30&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.29
php-src/ext/standard/basic_functions.c:1.725.2.30
--- php-src/ext/standard/basic_functions.c:1.725.2.29 Mon Mar 20 23:32:58 2006
+++ php-src/ext/standard/basic_functions.c Mon Apr 3 09:14:33 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.29 2006/03/20 23:32:58 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.30 2006/04/03 09:14:33 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1832,7 +1832,7 @@
c_ts = (double)(d_ts - tm.tv_sec - tm.tv_usec / 1000000.00);
if (c_ts < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sleep until to
time is less then current time.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sleep until to
time is less than current time.");
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
