Skip to content

Commit 4d997f6

Browse files
weltlingweltling
committed
master renames phase 3
1 parent 6f9f0bf commit 4d997f6

File tree

131 files changed

+635
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+635
-643
lines changed

‎Zend/zend.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent,
174174
}
175175
} else {
176176
char key[25];
177-
snprintf(key, sizeof(key), ZEND_INT_FMT, num_key);
177+
snprintf(key, sizeof(key), ZEND_LONG_FMT, num_key);
178178
ZEND_PUTS_EX(key);
179179
}
180180
ZEND_PUTS_EX("] => ");
@@ -204,7 +204,7 @@ static void print_flat_hash(HashTable *ht TSRMLS_DC) /* {{{ */
204204
if (string_key) {
205205
ZEND_WRITE(string_key->val, string_key->len);
206206
} else {
207-
zend_printf(ZEND_UINT_FMT, num_key);
207+
zend_printf(ZEND_ULONG_FMT, num_key);
208208
}
209209
ZEND_PUTS("] => ");
210210
zend_print_flat_zval_r(tmp TSRMLS_CC);
@@ -235,7 +235,7 @@ ZEND_API int zend_make_printable_zval(zval *expr, zval *expr_copy TSRMLS_DC) /*
235235
char buf[sizeof("Resource id #") + MAX_LENGTH_OF_LONG];
236236
int len;
237237

238-
len = snprintf(buf, sizeof(buf), "Resource id #" ZEND_INT_FMT, Z_RES_HANDLE_P(expr));
238+
len = snprintf(buf, sizeof(buf), "Resource id #" ZEND_LONG_FMT, Z_RES_HANDLE_P(expr));
239239
ZVAL_NEW_STR(expr_copy, zend_string_init(buf, len, 0));
240240
}
241241
break;

‎Zend/zend_API.c

+9-9
Original file line numberDiff line numberDiff line change
@@ -430,11 +430,11 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
430430
return "long";
431431
} else if (type == IS_DOUBLE) {
432432
if (c == 'L') {
433-
if (d > ZEND_INT_MAX) {
434-
*p = ZEND_INT_MAX;
433+
if (d > ZEND_LONG_MAX) {
434+
*p = ZEND_LONG_MAX;
435435
break;
436-
} else if (d < ZEND_INT_MIN) {
437-
*p = ZEND_INT_MIN;
436+
} else if (d < ZEND_LONG_MIN) {
437+
*p = ZEND_LONG_MIN;
438438
break;
439439
}
440440
}
@@ -446,11 +446,11 @@ static const char *zend_parse_arg_impl(int arg_num, zval *arg, va_list *va, cons
446446

447447
case IS_DOUBLE:
448448
if (c == 'L') {
449-
if (Z_DVAL_P(arg) > ZEND_INT_MAX) {
450-
*p = ZEND_INT_MAX;
449+
if (Z_DVAL_P(arg) > ZEND_LONG_MAX) {
450+
*p = ZEND_LONG_MAX;
451451
break;
452-
} else if (Z_DVAL_P(arg) < ZEND_INT_MIN) {
453-
*p = ZEND_INT_MIN;
452+
} else if (Z_DVAL_P(arg) < ZEND_LONG_MIN) {
453+
*p = ZEND_LONG_MIN;
454454
break;
455455
}
456456
}
@@ -1686,7 +1686,7 @@ ZEND_API int array_set_zval_key(HashTable *ht, zval *key, zval *value TSRMLS_DC)
16861686
result = zend_symtable_update(ht, STR_EMPTY_ALLOC(), value);
16871687
break;
16881688
case IS_RESOURCE:
1689-
zend_error(E_STRICT, "Resource ID#" ZEND_INT_FMT " used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key));
1689+
zend_error(E_STRICT, "Resource ID#" ZEND_LONG_FMT " used as offset, casting to integer (%pd)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key));
16901690
result = zend_hash_index_update(ht, Z_RES_HANDLE_P(key), value);
16911691
break;
16921692
case IS_FALSE:

‎Zend/zend_API.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -1081,10 +1081,10 @@ static zend_always_inline int _z_param_long(zval *arg, zend_long *dest, zend_boo
10811081
if (EXPECTED(Z_TYPE_P(arg) == IS_LONG)) {
10821082
*dest = Z_LVAL_P(arg);
10831083
} else if (EXPECTED(Z_TYPE_P(arg) == IS_DOUBLE)) {
1084-
if (strict && UNEXPECTED(Z_DVAL_P(arg) > ZEND_INT_MAX)) {
1085-
*dest = ZEND_INT_MAX;
1086-
} else if (strict && UNEXPECTED(Z_DVAL_P(arg) < ZEND_INT_MIN)) {
1087-
*dest = ZEND_INT_MIN;
1084+
if (strict && UNEXPECTED(Z_DVAL_P(arg) > ZEND_LONG_MAX)) {
1085+
*dest = ZEND_LONG_MAX;
1086+
} else if (strict && UNEXPECTED(Z_DVAL_P(arg) < ZEND_LONG_MIN)) {
1087+
*dest = ZEND_LONG_MIN;
10881088
} else {
10891089
*dest = zend_dval_to_lval(Z_DVAL_P(arg));
10901090
}
@@ -1094,10 +1094,10 @@ static zend_always_inline int _z_param_long(zval *arg, zend_long *dest, zend_boo
10941094

10951095
if (UNEXPECTED((type = is_numeric_str_function(Z_STR_P(arg), dest, &d)) != IS_LONG)) {
10961096
if (EXPECTED(type != 0)) {
1097-
if (strict && UNEXPECTED(d > ZEND_INT_MAX)) {
1098-
*dest = ZEND_INT_MAX;
1099-
} else if (strict && UNEXPECTED(d < ZEND_INT_MIN)) {
1100-
*dest = ZEND_INT_MIN;
1097+
if (strict && UNEXPECTED(d > ZEND_LONG_MAX)) {
1098+
*dest = ZEND_LONG_MAX;
1099+
} else if (strict && UNEXPECTED(d < ZEND_LONG_MIN)) {
1100+
*dest = ZEND_LONG_MIN;
11011101
} else {
11021102
*dest = zend_dval_to_lval(d);
11031103
}

‎Zend/zend_alloc.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1984,9 +1984,9 @@ static void *_zend_mm_alloc_int(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_D
19841984
#endif
19851985
HANDLE_UNBLOCK_INTERRUPTIONS();
19861986
#if ZEND_DEBUG
1987-
zend_mm_safe_error(heap, "Allowed memory size of " ZEND_UINT_FMT " bytes exhausted at %s:%d (tried to allocate " ZEND_UINT_FMT " bytes)", heap->limit, __zend_filename, __zend_lineno, size);
1987+
zend_mm_safe_error(heap, "Allowed memory size of " ZEND_ULONG_FMT " bytes exhausted at %s:%d (tried to allocate " ZEND_ULONG_FMT " bytes)", heap->limit, __zend_filename, __zend_lineno, size);
19881988
#else
1989-
zend_mm_safe_error(heap, "Allowed memory size of " ZEND_UINT_FMT " bytes exhausted (tried to allocate " ZEND_UINT_FMT " bytes)", heap->limit, size);
1989+
zend_mm_safe_error(heap, "Allowed memory size of " ZEND_ULONG_FMT " bytes exhausted (tried to allocate " ZEND_ULONG_FMT " bytes)", heap->limit, size);
19901990
#endif
19911991
}
19921992

@@ -2297,9 +2297,9 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_
22972297
#endif
22982298
HANDLE_UNBLOCK_INTERRUPTIONS();
22992299
#if ZEND_DEBUG
2300-
zend_mm_safe_error(heap, "Allowed memory size of " ZEND_UINT_FMT " bytes exhausted at %s:%d (tried to allocate " ZEND_UINT_FMT " bytes)", heap->limit, __zend_filename, __zend_lineno, size);
2300+
zend_mm_safe_error(heap, "Allowed memory size of " ZEND_ULONG_FMT " bytes exhausted at %s:%d (tried to allocate " ZEND_ULONG_FMT " bytes)", heap->limit, __zend_filename, __zend_lineno, size);
23012301
#else
2302-
zend_mm_safe_error(heap, "Allowed memory size of " ZEND_UINT_FMT " bytes exhausted (tried to allocate " ZEND_UINT_FMT " bytes)", heap->limit, size);
2302+
zend_mm_safe_error(heap, "Allowed memory size of " ZEND_ULONG_FMT " bytes exhausted (tried to allocate " ZEND_ULONG_FMT " bytes)", heap->limit, size);
23032303
#endif
23042304
return NULL;
23052305
}

‎Zend/zend_builtin_functions.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ ZEND_FUNCTION(func_get_arg)
438438
arg_count = ex->num_args;
439439

440440
if (requested_offset >= arg_count) {
441-
zend_error(E_WARNING, "func_get_arg(): Argument " ZEND_INT_FMT " not passed to function", requested_offset);
441+
zend_error(E_WARNING, "func_get_arg(): Argument " ZEND_LONG_FMT " not passed to function", requested_offset);
442442
RETURN_FALSE;
443443
}
444444

‎Zend/zend_exceptions.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ static void _build_trace_args(zval *arg, zend_string **str_ptr TSRMLS_DC) /* {{{
461461
case IS_RESOURCE: {
462462
zend_long lval = Z_RES_HANDLE_P(arg);
463463
char s_tmp[MAX_LENGTH_OF_LONG + 1];
464-
int l_tmp = zend_sprintf(s_tmp, ZEND_INT_FMT, lval); /* SAFE */
464+
int l_tmp = zend_sprintf(s_tmp, ZEND_LONG_FMT, lval); /* SAFE */
465465
TRACE_APPEND_STR("Resource id #");
466466
TRACE_APPEND_STRL(s_tmp, l_tmp);
467467
TRACE_APPEND_STR(", ");
@@ -470,7 +470,7 @@ static void _build_trace_args(zval *arg, zend_string **str_ptr TSRMLS_DC) /* {{{
470470
case IS_LONG: {
471471
zend_long lval = Z_LVAL_P(arg);
472472
char s_tmp[MAX_LENGTH_OF_LONG + 1];
473-
int l_tmp = zend_sprintf(s_tmp, ZEND_INT_FMT, lval); /* SAFE */
473+
int l_tmp = zend_sprintf(s_tmp, ZEND_LONG_FMT, lval); /* SAFE */
474474
TRACE_APPEND_STRL(s_tmp, l_tmp);
475475
TRACE_APPEND_STR(", ");
476476
break;

‎Zend/zend_execute.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1024,14 +1024,14 @@ static zend_always_inline zval *zend_fetch_dimension_address_inner(HashTable *ht
10241024
if (retval == NULL) {
10251025
switch (type) {
10261026
case BP_VAR_R:
1027-
zend_error(E_NOTICE,"Undefined offset: " ZEND_UINT_FMT, hval);
1027+
zend_error(E_NOTICE,"Undefined offset: " ZEND_ULONG_FMT, hval);
10281028
/* break missing intentionally */
10291029
case BP_VAR_UNSET:
10301030
case BP_VAR_IS:
10311031
retval = &EG(uninitialized_zval);
10321032
break;
10331033
case BP_VAR_RW:
1034-
zend_error(E_NOTICE,"Undefined offset: " ZEND_UINT_FMT, hval);
1034+
zend_error(E_NOTICE,"Undefined offset: " ZEND_ULONG_FMT, hval);
10351035
/* break missing intentionally */
10361036
case BP_VAR_W:
10371037
retval = zend_hash_index_add_new(ht, hval, &EG(uninitialized_zval));

‎Zend/zend_hash.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ static zend_always_inline zval *_zend_hash_index_update_or_next_insert_i(HashTab
431431
}
432432
ZVAL_COPY_VALUE(&p->val, pData);
433433
if ((zend_long)h >= (zend_long)ht->nNextFreeElement) {
434-
ht->nNextFreeElement = h < ZEND_INT_MAX ? h + 1 : ZEND_INT_MAX;
434+
ht->nNextFreeElement = h < ZEND_LONG_MAX ? h + 1 : ZEND_LONG_MAX;
435435
}
436436
return &p->val;
437437
} else { /* we have to keep the order :( */
@@ -461,7 +461,7 @@ static zend_always_inline zval *_zend_hash_index_update_or_next_insert_i(HashTab
461461
ht->nInternalPointer = h;
462462
}
463463
if ((zend_long)h >= (zend_long)ht->nNextFreeElement) {
464-
ht->nNextFreeElement = h < ZEND_INT_MAX ? h + 1 : ZEND_INT_MAX;
464+
ht->nNextFreeElement = h < ZEND_LONG_MAX ? h + 1 : ZEND_LONG_MAX;
465465
}
466466
p->h = h;
467467
p->key = NULL;
@@ -491,7 +491,7 @@ static zend_always_inline zval *_zend_hash_index_update_or_next_insert_i(HashTab
491491
ZVAL_COPY_VALUE(&p->val, pData);
492492
HANDLE_UNBLOCK_INTERRUPTIONS();
493493
if ((zend_long)h >= (zend_long)ht->nNextFreeElement) {
494-
ht->nNextFreeElement = h < ZEND_INT_MAX ? h + 1 : ZEND_INT_MAX;
494+
ht->nNextFreeElement = h < ZEND_LONG_MAX ? h + 1 : ZEND_LONG_MAX;
495495
}
496496
return &p->val;
497497
}
@@ -506,7 +506,7 @@ static zend_always_inline zval *_zend_hash_index_update_or_next_insert_i(HashTab
506506
ht->nInternalPointer = idx;
507507
}
508508
if ((zend_long)h >= (zend_long)ht->nNextFreeElement) {
509-
ht->nNextFreeElement = h < ZEND_INT_MAX ? h + 1 : ZEND_INT_MAX;
509+
ht->nNextFreeElement = h < ZEND_LONG_MAX ? h + 1 : ZEND_LONG_MAX;
510510
}
511511
p = ht->arData + idx;
512512
p->h = h;

‎Zend/zend_hash.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,11 @@ static inline int _zend_handle_numeric_str(const char *key, size_t length, zend_
268268
++tmp;
269269
if (tmp == end) {
270270
if (*key == '-') {
271-
if (*idx-1 > ZEND_INT_MAX) { /* overflow */
271+
if (*idx-1 > ZEND_LONG_MAX) { /* overflow */
272272
return 0;
273273
}
274274
*idx = 0 - *idx;
275-
} else if (*idx > ZEND_INT_MAX) { /* overflow */
275+
} else if (*idx > ZEND_LONG_MAX) { /* overflow */
276276
return 0;
277277
}
278278
return 1;

‎Zend/zend_ini.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ ZEND_API zend_long zend_ini_long(char *name, uint name_length, int orig) /* {{{
360360
ini_entry = zend_hash_str_find_ptr(EG(ini_directives), name, name_length);
361361
if (ini_entry) {
362362
if (orig && ini_entry->modified) {
363-
return (ini_entry->orig_value ? ZEND_STRTOI(ini_entry->orig_value, NULL, 0) : 0);
363+
return (ini_entry->orig_value ? ZEND_STRTOL(ini_entry->orig_value, NULL, 0) : 0);
364364
} else {
365-
return (ini_entry->value ? ZEND_STRTOI(ini_entry->value, NULL, 0) : 0);
365+
return (ini_entry->value ? ZEND_STRTOL(ini_entry->value, NULL, 0) : 0);
366366
}
367367
}
368368

‎Zend/zend_int.h

+42-42
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
/* $Id$ */
2020

2121

22-
#ifndef ZEND_INT_H
23-
#define ZEND_INT_H
22+
#ifndef ZEND_LONG_H
23+
#define ZEND_LONG_H
2424

2525
#include "main/php_stdint.h"
2626

@@ -37,8 +37,8 @@
3737
typedef __int64 zend_long;
3838
typedef unsigned __int64 zend_ulong;
3939
typedef __int64 zend_off_t;
40-
# define ZEND_INT_MAX _I64_MAX
41-
# define ZEND_INT_MIN _I64_MIN
40+
# define ZEND_LONG_MAX _I64_MAX
41+
# define ZEND_LONG_MIN _I64_MIN
4242
# define ZEND_UINT_MAX _UI64_MAX
4343
# define Z_I(i) i##i64
4444
# define Z_UI(i) i##Ui64
@@ -50,8 +50,8 @@ typedef __int64 zend_off_t;
5050
typedef int64_t zend_long;
5151
typedef uint64_t zend_ulong;
5252
typedef off_t zend_off_t;
53-
# define ZEND_INT_MAX INT64_MAX
54-
# define ZEND_INT_MIN INT64_MIN
53+
# define ZEND_LONG_MAX INT64_MAX
54+
# define ZEND_LONG_MIN INT64_MIN
5555
# define ZEND_UINT_MAX UINT64_MAX
5656
# define Z_I(i) i##LL
5757
# define Z_UI(i) i##ULL
@@ -64,8 +64,8 @@ typedef off_t zend_off_t;
6464
typedef long zend_long;
6565
typedef unsigned long zend_ulong;
6666
typedef long zend_off_t;
67-
# define ZEND_INT_MAX LONG_MAX
68-
# define ZEND_INT_MIN LONG_MIN
67+
# define ZEND_LONG_MAX LONG_MAX
68+
# define ZEND_LONG_MIN LONG_MIN
6969
# define ZEND_UINT_MAX ULONG_MAX
7070
# define Z_I(i) i##L
7171
# define Z_UI(i) i##UL
@@ -74,63 +74,63 @@ typedef long zend_off_t;
7474

7575

7676
/* conversion macros */
77-
#define ZEND_ITOA_BUF_LEN 65
77+
#define ZEND_LTOA_BUF_LEN 65
7878

7979
#ifdef ZEND_ENABLE_INT64
8080
# ifdef PHP_WIN32
81-
# define ZEND_ITOA(i, s, len) _i64toa_s((i), (s), (len), 10)
82-
# define ZEND_ATOI(i, s) i = _atoi64((s))
83-
# define ZEND_STRTOI(s0, s1, base) _strtoi64((s0), (s1), (base))
84-
# define ZEND_STRTOUI(s0, s1, base) _strtoui64((s0), (s1), (base))
85-
# define ZEND_INT_FMT "%I64d"
86-
# define ZEND_UINT_FMT "%I64u"
87-
# define ZEND_INT_FMT_SPEC "I64d"
88-
# define ZEND_UINT_FMT_SPEC "I64u"
89-
# define ZEND_STRTOI_PTR _strtoi64
90-
# define ZEND_STRTOUI_PTR _strtoui64
81+
# define ZEND_LTOA(i, s, len) _i64toa_s((i), (s), (len), 10)
82+
# define ZEND_ATOL(i, s) i = _atoi64((s))
83+
# define ZEND_STRTOL(s0, s1, base) _strtoi64((s0), (s1), (base))
84+
# define ZEND_STRTOUL(s0, s1, base) _strtoui64((s0), (s1), (base))
85+
# define ZEND_LONG_FMT "%I64d"
86+
# define ZEND_ULONG_FMT "%I64u"
87+
# define ZEND_LONG_FMT_SPEC "I64d"
88+
# define ZEND_ULONG_FMT_SPEC "I64u"
89+
# define ZEND_STRTOL_PTR _strtoi64
90+
# define ZEND_STRTOUL_PTR _strtoui64
9191
# define ZEND_ABS _abs64
9292
# else
93-
# define ZEND_ITOA(i, s, len) \
93+
# define ZEND_LTOA(i, s, len) \
9494
do { \
9595
int st = snprintf((s), (len), "%lld", (i)); \
9696
(s)[st] = '\0'; \
9797
} while (0)
98-
# define ZEND_ATOI(i, s) (i) = atoll((s))
99-
# define ZEND_STRTOI(s0, s1, base) strtoll((s0), (s1), (base))
100-
# define ZEND_STRTOUI(s0, s1, base) strtoull((s0), (s1), (base))
101-
# define ZEND_INT_FMT "%" PRId64
102-
# define ZEND_UINT_FMT "%" PRIu64
103-
# define ZEND_INT_FMT_SPEC PRId64
104-
# define ZEND_UINT_FMT_SPEC PRIu64
105-
# define ZEND_STRTOI_PTR strtoll
106-
# define ZEND_STRTOUI_PTR strtoull
98+
# define ZEND_ATOL(i, s) (i) = atoll((s))
99+
# define ZEND_STRTOL(s0, s1, base) strtoll((s0), (s1), (base))
100+
# define ZEND_STRTOUL(s0, s1, base) strtoull((s0), (s1), (base))
101+
# define ZEND_LONG_FMT "%" PRId64
102+
# define ZEND_ULONG_FMT "%" PRIu64
103+
# define ZEND_LONG_FMT_SPEC PRId64
104+
# define ZEND_ULONG_FMT_SPEC PRIu64
105+
# define ZEND_STRTOL_PTR strtoll
106+
# define ZEND_STRTOUL_PTR strtoull
107107
# define ZEND_ABS llabs
108108
# endif
109109
#else
110-
# define ZEND_STRTOI(s0, s1, base) strtol((s0), (s1), (base))
111-
# define ZEND_STRTOUI(s0, s1, base) strtoul((s0), (s1), (base))
110+
# define ZEND_STRTOL(s0, s1, base) strtol((s0), (s1), (base))
111+
# define ZEND_STRTOUL(s0, s1, base) strtoul((s0), (s1), (base))
112112
# ifdef PHP_WIN32
113-
# define ZEND_ITOA(i, s, len) _ltoa_s((i), (s), (len), 10)
114-
# define ZEND_ATOI(i, s) i = atol((s))
113+
# define ZEND_LTOA(i, s, len) _ltoa_s((i), (s), (len), 10)
114+
# define ZEND_ATOL(i, s) i = atol((s))
115115
# else
116-
# define ZEND_ITOA(i, s, len) \
116+
# define ZEND_LTOA(i, s, len) \
117117
do { \
118118
int st = snprintf((s), (len), "%ld", (i)); \
119119
(s)[st] = '\0'; \
120120
} while (0)
121-
# define ZEND_ATOI(i, s) (i) = atol((s))
121+
# define ZEND_ATOL(i, s) (i) = atol((s))
122122
# endif
123-
# define ZEND_INT_FMT "%ld"
124-
# define ZEND_UINT_FMT "%lu"
125-
# define ZEND_INT_FMT_SPEC "ld"
126-
# define ZEND_UINT_FMT_SPEC "lu"
127-
# define ZEND_STRTOI_PTR strtol
128-
# define ZEND_STRTOUI_PTR strtoul
123+
# define ZEND_LONG_FMT "%ld"
124+
# define ZEND_ULONG_FMT "%lu"
125+
# define ZEND_LONG_FMT_SPEC "ld"
126+
# define ZEND_ULONG_FMT_SPEC "lu"
127+
# define ZEND_STRTOL_PTR strtol
128+
# define ZEND_STRTOUL_PTR strtoul
129129
# define ZEND_ABS abs
130130
#endif
131131

132132

133-
#endif /* ZEND_INT_H */
133+
#endif /* ZEND_LONG_H */
134134

135135
/*
136136
* Local variables:

0 commit comments

Comments
 (0)