johannes Wed Aug 8 14:52:41 2007 UTC
Modified files:
/php-src/ext/standard array.c
Log:
- Fix build (patch by Ulf Wendel)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.412&r2=1.413&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.412 php-src/ext/standard/array.c:1.413
--- php-src/ext/standard/array.c:1.412 Wed Aug 8 07:46:00 2007
+++ php-src/ext/standard/array.c Wed Aug 8 14:52:40 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.412 2007/08/08 07:46:00 jani Exp $ */
+/* $Id: array.c,v 1.413 2007/08/08 14:52:40 johannes Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1277,19 +1277,19 @@
if (var_name_type == IS_STRING) {
/* These are allowed as first char: [a-zA-Z_\x7f-\xff] */
- if (var_name[0] == '_' ||
- (((int)((unsigned char *)var_name)[0]) >= 65 /* A
*/ && /* Z */ 90 <= ((int)((unsigned char *)var_name)[0])) ||
- (((int)((unsigned char *)var_name)[0]) >= 97 /* a
*/ && /* z */ 122 <= ((int)((unsigned char *)var_name)[0])) ||
- (((int)((unsigned char *)var_name)[0]) >= 127 /* 0x7f
*/ && /* 0xff */ 255 <= ((int)((unsigned char *)var_name)[0]))
+ if (((unsigned char *)var_name.s)[0] == '_' ||
+ (((int)((unsigned char *)var_name.s)[0]) >= 65 /* A
*/ && /* Z */ 90 <= ((int)((unsigned char *)var_name.s)[0])) ||
+ (((int)((unsigned char *)var_name.s)[0]) >= 97 /* a
*/ && /* z */ 122 <= ((int)((unsigned char *)var_name.s)[0])) ||
+ (((int)((unsigned char *)var_name.s)[0]) >= 127 /* 0x7f
*/ && /* 0xff */ 255 <= ((int)((unsigned char *)var_name.s)[0]))
) {
/* And these as the rest: [a-zA-Z0-9_\x7f-\xff] */
- if (len > 1) {
- for (i = 1; i < len; i++) {
- if (var_name[i] == '_' ||
- (((int)((unsigned char
*)var_name)[i]) >= 48 /* 0 */ && /* 9 */ 57 <= ((int)((unsigned char
*)var_name)[i])) ||
- (((int)((unsigned char
*)var_name)[i]) >= 65 /* A */ && /* Z */ 90 <= ((int)((unsigned char
*)var_name)[i])) ||
- (((int)((unsigned char
*)var_name)[i]) >= 97 /* a */ && /* z */ 122 <= ((int)((unsigned char
*)var_name)[i])) ||
- (((int)((unsigned char
*)var_name)[i]) >= 127 /* 0x7f */ && /* 0xff */ 255 <= ((int)((unsigned char
*)var_name)[i]))
+ if (var_name_len > 1) {
+ for (i = 1; i < var_name_len; i++) {
+ if (((unsigned char*)var_name.s)[i] ==
'_' ||
+ (((int)((unsigned char
*)var_name.s)[i]) >= 48 /* 0 */ && /* 9 */ 57 <= ((int)((unsigned
char*)var_name.s)[i])) ||
+ (((int)((unsigned char
*)var_name.s)[i]) >= 65 /* A */ && /* Z */ 90 <= ((int)((unsigned
char*)var_name.s)[i])) ||
+ (((int)((unsigned char
*)var_name.s)[i]) >= 97 /* a */ && /* z */ 122 <= ((int)((unsigned
char*)var_name.s)[i])) ||
+ (((int)((unsigned char
*)var_name.s)[i]) >= 127 /* 0x7f */ && /* 0xff */ 255 <= ((int)((unsigned
char*)var_name.s)[i]))
) { } else {
return 0;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
