archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

master renamings phase 5

Browse source
This commit is contained in:
Anatol Belski 2014-08-25 21:20:44 +02:00
parent 455741fce3
commit 28b7a03318
18 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend.h
View file

@ -273,14 +273,14 @@ char *alloca ();
#define LONG_MIN (- LONG_MAX - 1) #define LONG_MIN (- LONG_MAX - 1)
#endif #endif
#if SIZEOF_ZEND_INT == 4 #if SIZEOF_ZEND_LONG == 4
#define MAX_LENGTH_OF_LONG 11 #define MAX_LENGTH_OF_LONG 11
static const char long_min_digits[] = "2147483648"; static const char long_min_digits[] = "2147483648";
#elif SIZEOF_ZEND_INT == 8 #elif SIZEOF_ZEND_LONG == 8
#define MAX_LENGTH_OF_LONG 20 #define MAX_LENGTH_OF_LONG 20
static const char long_min_digits[] = "9223372036854775808"; static const char long_min_digits[] = "9223372036854775808";
#else #else
#error "Unknown SIZEOF_ZEND_INT" #error "Unknown SIZEOF_ZEND_LONG"
#endif #endif
#define MAX_LENGTH_OF_DOUBLE 32 #define MAX_LENGTH_OF_DOUBLE 32

2
Zend/zend_compile.h
View file

@ -128,7 +128,7 @@ typedef struct _zend_try_catch_element {
uint32_t finally_end; uint32_t finally_end;
} zend_try_catch_element; } zend_try_catch_element;
#if SIZEOF_ZEND_INT == 8 #if SIZEOF_ZEND_LONG == 8
# ifdef _WIN32 # ifdef _WIN32
# define THIS_HASHVAL 6385726429Ui64 # define THIS_HASHVAL 6385726429Ui64
# else # else

2
Zend/zend_hash.h
View file

@ -258,7 +258,7 @@ static inline int _zend_handle_numeric_str(const char *key, size_t length, zend_
if ((*end != '\0') /* not a null terminated string */ if ((*end != '\0') /* not a null terminated string */
|| (*tmp == '0' && length > 1) /* numbers with leading zeros */ || (*tmp == '0' && length > 1) /* numbers with leading zeros */
|| (end - tmp > MAX_LENGTH_OF_LONG - 1) /* number too long */ || (end - tmp > MAX_LENGTH_OF_LONG - 1) /* number too long */
|| (SIZEOF_ZEND_INT == 4 && || (SIZEOF_ZEND_LONG == 4 &&
end - tmp == MAX_LENGTH_OF_LONG - 1 && end - tmp == MAX_LENGTH_OF_LONG - 1 &&
*tmp > '2')) { /* overflow */ *tmp > '2')) { /* overflow */
return 0; return 0;

4
Zend/zend_language_scanner.c
View file

@ -3314,7 +3314,7 @@ yy200:
--len; --len;
} }
if (len < SIZEOF_ZEND_INT * 8) { if (len < SIZEOF_ZEND_LONG * 8) {
if (len == 0) { if (len == 0) {
ZVAL_LONG(zendlval, 0); ZVAL_LONG(zendlval, 0);
} else { } else {
@ -3349,7 +3349,7 @@ yy203:
len--; len--;
} }
if (len < SIZEOF_ZEND_INT * 2 || (len == SIZEOF_ZEND_INT * 2 && *hex <= '7')) { if (len < SIZEOF_ZEND_LONG * 2 || (len == SIZEOF_ZEND_LONG * 2 && *hex <= '7')) {
if (len == 0) { if (len == 0) {
ZVAL_LONG(zendlval, 0); ZVAL_LONG(zendlval, 0);
} else { } else {

4
Zend/zend_language_scanner.l
View file

@ -1521,7 +1521,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
--len; --len;
} }
if (len < SIZEOF_ZEND_INT * 8) { if (len < SIZEOF_ZEND_LONG * 8) {
if (len == 0) { if (len == 0) {
ZVAL_LONG(zendlval, 0); ZVAL_LONG(zendlval, 0);
} else { } else {
@ -1562,7 +1562,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
len--; len--;
} }
if (len < SIZEOF_ZEND_INT * 2 || (len == SIZEOF_ZEND_INT * 2 && *hex <= '7')) { if (len < SIZEOF_ZEND_LONG * 2 || (len == SIZEOF_ZEND_LONG * 2 && *hex <= '7')) {
if (len == 0) { if (len == 0) {
ZVAL_LONG(zendlval, 0); ZVAL_LONG(zendlval, 0);
} else { } else {

4
Zend/zend_long.h
View file

@ -59,7 +59,7 @@ typedef off_t zend_off_t;
# error Cant enable 64 bit integers on non 64 bit platform # error Cant enable 64 bit integers on non 64 bit platform
# endif # endif
# endif # endif
# define SIZEOF_ZEND_INT 8 # define SIZEOF_ZEND_LONG 8
#else #else
typedef long zend_long; typedef long zend_long;
typedef unsigned long zend_ulong; typedef unsigned long zend_ulong;
@ -69,7 +69,7 @@ typedef long zend_off_t;
# define ZEND_ULONG_MAX ULONG_MAX # define ZEND_ULONG_MAX ULONG_MAX
# define Z_I(i) i##L # define Z_I(i) i##L
# define Z_UL(i) i##UL # define Z_UL(i) i##UL
# define SIZEOF_ZEND_INT SIZEOF_LONG # define SIZEOF_ZEND_LONG SIZEOF_LONG
#endif #endif

2
Zend/zend_multiply.h
View file

@ -81,7 +81,7 @@
} \ } \
} while (0) } while (0)
#elif SIZEOF_ZEND_INT == 4 && defined(HAVE_ZEND_LONG64) #elif SIZEOF_ZEND_LONG == 4 && defined(HAVE_ZEND_LONG64)
#define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \ #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \
zend_long64 __result = (zend_long64) (a) * (zend_long64) (b); \ zend_long64 __result = (zend_long64) (a) * (zend_long64) (b); \

4
Zend/zend_operators.h
View file

@ -73,7 +73,7 @@ END_EXTERN_C()
#if ZEND_DVAL_TO_LVAL_CAST_OK #if ZEND_DVAL_TO_LVAL_CAST_OK
# define zend_dval_to_lval(d) ((zend_long) (d)) # define zend_dval_to_lval(d) ((zend_long) (d))
#elif SIZEOF_ZEND_INT == 4 #elif SIZEOF_ZEND_LONG == 4
static zend_always_inline zend_long zend_dval_to_lval(double d) static zend_always_inline zend_long zend_dval_to_lval(double d)
{ {
if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) { if (d > ZEND_LONG_MAX || d < ZEND_LONG_MIN) {
@ -202,7 +202,7 @@ check_digits:
dp_or_e = -1; dp_or_e = -1;
goto process_double; goto process_double;
} }
} else if (!(digits < SIZEOF_ZEND_INT * 2 || (digits == SIZEOF_ZEND_INT * 2 && ptr[-digits] <= '7'))) { } else if (!(digits < SIZEOF_ZEND_LONG * 2 || (digits == SIZEOF_ZEND_LONG * 2 && ptr[-digits] <= '7'))) {
if (dval) { if (dval) {
local_dval = zend_hex_strtod(str, &ptr); local_dval = zend_hex_strtod(str, &ptr);
} }

14
ext/mysqli/mysqli_api.c
View file

@ -213,9 +213,9 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned in
break; break;
case 'i': /* Integer */ case 'i': /* Integer */
#if SIZEOF_ZEND_INT==8 #if SIZEOF_ZEND_LONG==8
bind[ofs].buffer_type = MYSQL_TYPE_LONGLONG; bind[ofs].buffer_type = MYSQL_TYPE_LONGLONG;
#elif SIZEOF_ZEND_INT==4 #elif SIZEOF_ZEND_LONG==4
bind[ofs].buffer_type = MYSQL_TYPE_LONG; bind[ofs].buffer_type = MYSQL_TYPE_LONG;
#endif #endif
bind[ofs].buffer = &Z_LVAL_P(param); bind[ofs].buffer = &Z_LVAL_P(param);
@ -284,9 +284,9 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned in
type = MYSQL_TYPE_DOUBLE; type = MYSQL_TYPE_DOUBLE;
break; break;
case 'i': /* Integer */ case 'i': /* Integer */
#if SIZEOF_ZEND_INT==8 #if SIZEOF_ZEND_LONG==8
type = MYSQL_TYPE_LONGLONG; type = MYSQL_TYPE_LONGLONG;
#elif SIZEOF_ZEND_INT==4 #elif SIZEOF_ZEND_LONG==4
type = MYSQL_TYPE_LONG; type = MYSQL_TYPE_LONG;
#endif #endif
break; break;
@ -996,7 +996,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
{ {
/* unsigned int (11) */ /* unsigned int (11) */
uval= *(unsigned int *) stmt->result.buf[i].val; uval= *(unsigned int *) stmt->result.buf[i].val;
#if SIZEOF_ZEND_INT==4 #if SIZEOF_ZEND_LONG==4
if (uval > INT_MAX) { if (uval > INT_MAX) {
char *tmp, *p; char *tmp, *p;
int j = 10; int j = 10;
@ -1047,9 +1047,9 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
{ {
llval= *(my_ulonglong *) stmt->result.buf[i].val; llval= *(my_ulonglong *) stmt->result.buf[i].val;
} }
#if SIZEOF_ZEND_INT==8 #if SIZEOF_ZEND_LONG==8
if (uns && llval > 9223372036854775807L) { if (uns && llval > 9223372036854775807L) {
#elif SIZEOF_ZEND_INT==4 #elif SIZEOF_ZEND_LONG==4
if ((uns && llval > L64(2147483647)) || if ((uns && llval > L64(2147483647)) ||
(!uns && (( L64(2147483647) < (my_longlong) llval) || (!uns && (( L64(2147483647) < (my_longlong) llval) ||
(L64(-2147483648) > (my_longlong) llval)))) (L64(-2147483648) > (my_longlong) llval))))

6
ext/mysqlnd/mysqlnd_ps_codec.c
View file

@ -76,7 +76,7 @@ ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, unsigne
case 1:uval = (uint64_t) uint1korr(*row);break; case 1:uval = (uint64_t) uint1korr(*row);break;
} }
#if SIZEOF_ZEND_INT==4 #if SIZEOF_ZEND_LONG==4
if (uval > INT_MAX) { if (uval > INT_MAX) {
DBG_INF("stringify"); DBG_INF("stringify");
tmp_len = sprintf((char *)&tmp, MYSQLND_LLU_SPEC, uval); tmp_len = sprintf((char *)&tmp, MYSQLND_LLU_SPEC, uval);
@ -105,7 +105,7 @@ ps_fetch_from_1_to_8_bytes(zval * zv, const MYSQLND_FIELD * const field, unsigne
case 1:lval = (int64_t) *(int8_t*)*row;break; case 1:lval = (int64_t) *(int8_t*)*row;break;
} }
#if SIZEOF_ZEND_INT==4 #if SIZEOF_ZEND_LONG==4
if ((L64(2147483647) < (int64_t) lval) || (L64(-2147483648) > (int64_t) lval)) { if ((L64(2147483647) < (int64_t) lval) || (L64(-2147483648) > (int64_t) lval)) {
DBG_INF("stringify"); DBG_INF("stringify");
tmp_len = sprintf((char *)&tmp, MYSQLND_LL_SPEC, lval); tmp_len = sprintf((char *)&tmp, MYSQLND_LL_SPEC, lval);
@ -663,7 +663,7 @@ mysqlnd_stmt_execute_store_types(MYSQLND_STMT_DATA * stmt, zval * copies, zend_u
short current_type = stmt->param_bind[i].type; short current_type = stmt->param_bind[i].type;
zval *parameter = &stmt->param_bind[i].zv; zval *parameter = &stmt->param_bind[i].zv;
/* our types are not unsigned */ /* our types are not unsigned */
#if SIZEOF_ZEND_INT==8 #if SIZEOF_ZEND_LONG==8
if (current_type == MYSQL_TYPE_LONG) { if (current_type == MYSQL_TYPE_LONG) {
current_type = MYSQL_TYPE_LONGLONG; current_type = MYSQL_TYPE_LONGLONG;
} }

6
ext/mysqlnd/mysqlnd_wireprotocol.c
View file

@ -1671,7 +1671,7 @@ php_mysqlnd_rowp_read_text_protocol_aux(MYSQLND_MEMORY_POOL_CHUNK * row_buffer,
zend_uchar save = *(p + len); zend_uchar save = *(p + len);
/* We have to make it ASCIIZ temporarily */ /* We have to make it ASCIIZ temporarily */
*(p + len) = '\0'; *(p + len) = '\0';
if (perm_bind.pack_len < SIZEOF_ZEND_INT) { if (perm_bind.pack_len < SIZEOF_ZEND_LONG) {
/* direct conversion */ /* direct conversion */
int64_t v = int64_t v =
#ifndef PHP_WIN32 #ifndef PHP_WIN32
@ -1689,9 +1689,9 @@ php_mysqlnd_rowp_read_text_protocol_aux(MYSQLND_MEMORY_POOL_CHUNK * row_buffer,
#endif #endif
zend_bool uns = fields_metadata[i].flags & UNSIGNED_FLAG? TRUE:FALSE; zend_bool uns = fields_metadata[i].flags & UNSIGNED_FLAG? TRUE:FALSE;
/* We have to make it ASCIIZ temporarily */ /* We have to make it ASCIIZ temporarily */
#if SIZEOF_ZEND_INT==8 #if SIZEOF_ZEND_LONG==8
if (uns == TRUE && v > 9223372036854775807L) if (uns == TRUE && v > 9223372036854775807L)
#elif SIZEOF_ZEND_INT==4 #elif SIZEOF_ZEND_LONG==4
if ((uns == TRUE && v > L64(2147483647)) || if ((uns == TRUE && v > L64(2147483647)) ||
(uns == FALSE && (( L64(2147483647) < (int64_t) v) || (uns == FALSE && (( L64(2147483647) < (int64_t) v) ||
(L64(-2147483648) > (int64_t) v)))) (L64(-2147483648) > (int64_t) v))))

2
ext/opcache/zend_accelerator_util_funcs.c
View file

@ -29,7 +29,7 @@
static uint32_t zend_accel_refcount = ZEND_PROTECTED_REFCOUNT; static uint32_t zend_accel_refcount = ZEND_PROTECTED_REFCOUNT;
#if SIZEOF_SIZE_T <= SIZEOF_ZEND_INT #if SIZEOF_SIZE_T <= SIZEOF_ZEND_LONG
/* If sizeof(void*) == sizeof(ulong) we can use zend_hash index functions */ /* If sizeof(void*) == sizeof(ulong) we can use zend_hash index functions */
# define accel_xlat_set(old, new) zend_hash_index_update_ptr(&ZCG(bind_hash), (zend_ulong)(zend_uintptr_t)(old), (new)) # define accel_xlat_set(old, new) zend_hash_index_update_ptr(&ZCG(bind_hash), (zend_ulong)(zend_uintptr_t)(old), (new))
# define accel_xlat_get(old) zend_hash_index_find_ptr(&ZCG(bind_hash), (zend_ulong)(zend_uintptr_t)(old)) # define accel_xlat_get(old) zend_hash_index_find_ptr(&ZCG(bind_hash), (zend_ulong)(zend_uintptr_t)(old))

2
ext/pdo_firebird/php_pdo_firebird_int.h
View file

@ -35,7 +35,7 @@
#define SHORT_MAX (1 << (8*sizeof(short)-1)) #define SHORT_MAX (1 << (8*sizeof(short)-1))
#if SIZEOF_ZEND_INT == 8 && !defined(PHP_WIN32) #if SIZEOF_ZEND_LONG == 8 && !defined(PHP_WIN32)
# define LL_MASK "l" # define LL_MASK "l"
# define LL_LIT(lit) lit ## L # define LL_LIT(lit) lit ## L
#else #else

4
ext/pdo_mysql/mysql_statement.c
View file

@ -551,9 +551,9 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_VAR_STRING); mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_VAR_STRING);
break; break;
case IS_LONG: case IS_LONG:
#if SIZEOF_ZEND_INT==8 #if SIZEOF_ZEND_LONG==8
mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_LONGLONG); mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_LONGLONG);
#elif SIZEOF_ZEND_INT==4 #elif SIZEOF_ZEND_LONG==4
mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_LONG); mysqlnd_stmt_bind_one_param(S->stmt, param->paramno, parameter, MYSQL_TYPE_LONG);
#endif /* SIZEOF_LONG */ #endif /* SIZEOF_LONG */
break; break;

4
ext/standard/pack.c
View file

@ -829,12 +829,12 @@ PHP_FUNCTION(unpack)
map = little_endian_long_map; map = little_endian_long_map;
} }
if (SIZEOF_ZEND_INT > 4 && issigned) { if (SIZEOF_ZEND_LONG > 4 && issigned) {
v = ~INT_MAX; v = ~INT_MAX;
} }
v |= php_unpack(&input[inputpos], 4, issigned, map); v |= php_unpack(&input[inputpos], 4, issigned, map);
if (SIZEOF_ZEND_INT > 4) { if (SIZEOF_ZEND_LONG > 4) {
if (type == 'l') { if (type == 'l') {
v = (signed int) v; v = (signed int) v;
} else { } else {

4
ext/standard/var_unserializer.c
View file

@ -1023,7 +1023,7 @@ yy63:
++YYCURSOR; ++YYCURSOR;
#line 588 "ext/standard/var_unserializer.re" #line 588 "ext/standard/var_unserializer.re"
{ {
#if SIZEOF_ZEND_INT == 4 #if SIZEOF_ZEND_LONG == 4
use_double: use_double:
#endif #endif
*p = YYCURSOR; *p = YYCURSOR;
@ -1134,7 +1134,7 @@ yy79:
++YYCURSOR; ++YYCURSOR;
#line 546 "ext/standard/var_unserializer.re" #line 546 "ext/standard/var_unserializer.re"
{ {
#if SIZEOF_ZEND_INT == 4 #if SIZEOF_ZEND_LONG == 4
int digits = YYCURSOR - start - 3; int digits = YYCURSOR - start - 3;
if (start[2] == '-' || start[2] == '+') { if (start[2] == '-' || start[2] == '+') {

4
ext/standard/var_unserializer.re
View file

@ -544,7 +544,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
} }
"i:" iv ";" { "i:" iv ";" {
#if SIZEOF_ZEND_INT == 4 #if SIZEOF_ZEND_LONG == 4
int digits = YYCURSOR - start - 3; int digits = YYCURSOR - start - 3;
if (start[2] == '-' || start[2] == '+') { if (start[2] == '-' || start[2] == '+') {
@ -586,7 +586,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
} }
"d:" (iv | nv | nvexp) ";" { "d:" (iv | nv | nvexp) ";" {
#if SIZEOF_ZEND_INT == 4 #if SIZEOF_ZEND_LONG == 4
use_double: use_double:
#endif #endif
*p = YYCURSOR; *p = YYCURSOR;

2
main/main.c
View file

@ -2214,7 +2214,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PHP_MAXPATHLEN", MAXPATHLEN, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", ZEND_LONG_MAX, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MAX", ZEND_LONG_MAX, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MIN", ZEND_LONG_MIN, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PHP_INT_MIN", ZEND_LONG_MIN, CONST_PERSISTENT | CONST_CS);
REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", SIZEOF_ZEND_INT, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PHP_INT_SIZE", SIZEOF_ZEND_LONG, CONST_PERSISTENT | CONST_CS);
#ifdef PHP_WIN32 #ifdef PHP_WIN32
REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_VERSION_MAJOR", EG(windows_version_info).dwMajorVersion, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PHP_WINDOWS_VERSION_MAJOR", EG(windows_version_info).dwMajorVersion, CONST_PERSISTENT | CONST_CS);