summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-08-16 15:34:04 +0200
committerAnatol Belski <ab@php.net>2014-08-16 15:34:04 +0200
commit5bb25776a00e1074d1230a311043b00f7cce9252 (patch)
treec19340a1ba7d9d2d1e90b84d92d2c8d3788842e1
parent7534bf125a9d4f7dd31b66a1a9781b12dd749bcc (diff)
downloadphp-git-5bb25776a00e1074d1230a311043b00f7cce9252.tar.gz
further fixes on core
-rw-r--r--Zend/zend.h2
-rw-r--r--Zend/zend_alloc.c10
-rw-r--r--Zend/zend_builtin_functions.c18
-rw-r--r--Zend/zend_compile.c4
-rw-r--r--Zend/zend_constants.c4
-rw-r--r--Zend/zend_constants.h4
-rw-r--r--Zend/zend_exceptions.c8
-rw-r--r--Zend/zend_execute.h2
-rw-r--r--Zend/zend_execute_API.c4
-rw-r--r--Zend/zend_language_scanner.c6
-rw-r--r--Zend/zend_language_scanner.l2
-rw-r--r--Zend/zend_multiply.h2
-rw-r--r--Zend/zend_objects.c2
-rw-r--r--Zend/zend_strtod.c52
-rw-r--r--ext/standard/filters.c4
-rw-r--r--ext/standard/html.c2
-rw-r--r--ext/standard/http.c2
-rw-r--r--ext/standard/info.c2
-rw-r--r--ext/standard/proc_open.c2
-rw-r--r--ext/standard/streamsfuncs.c2
-rw-r--r--ext/standard/var.c20
-rw-r--r--ext/standard/var_unserializer.c42
-rw-r--r--ext/standard/var_unserializer.re42
23 files changed, 119 insertions, 119 deletions
diff --git a/Zend/zend.h b/Zend/zend.h
index 3d539c33f9..051afd2a83 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -388,7 +388,7 @@ void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((nore
# else /* ! (CRAY || __arm) */
# define XtOffset(p_type, field) \
- ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
+ ((zend_int_t) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
# endif /* !CRAY */
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 2bdf3dacfd..195235ffd9 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -1373,7 +1373,7 @@ static int zend_mm_check_ptr(zend_mm_heap *heap, void *ptr, int silent ZEND_FILE
#ifdef ZTS
if (ZEND_MM_BAD_THREAD_ID(p)) {
if (!silent) {
- zend_debug_alloc_output("Invalid pointer: ((thread_id=0x%0.8X) != (expected=0x%0.8X))\n", (long)p->thread_id, (long)tsrm_thread_id());
+ zend_debug_alloc_output("Invalid pointer: ((thread_id=0x%0.8X) != (expected=0x%0.8X))\n", (zend_int_t)p->thread_id, (zend_int_t)tsrm_thread_id());
had_problems = 1;
} else {
return zend_mm_check_ptr(heap, ptr, 0 ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
@@ -2474,7 +2474,7 @@ ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_
static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
{
size_t res = nmemb;
- unsigned long overflow = 0;
+ zend_uint_t overflow = 0;
__asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1"
: "=&a"(res), "=&d" (overflow)
@@ -2494,7 +2494,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
{
size_t res = nmemb;
- unsigned long overflow = 0;
+ zend_uint_t overflow = 0;
#ifdef __ILP32__ /* x32 */
# define LP_SUFF "l"
@@ -2523,7 +2523,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
{
size_t res;
- unsigned long overflow;
+ zend_uint_t overflow;
__asm__ ("umlal %0,%1,%2,%3"
: "=r"(res), "=r"(overflow)
@@ -2544,7 +2544,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
{
size_t res;
- unsigned long overflow;
+ zend_uint_t overflow;
__asm__ ("mul %0,%2,%3\n\tumulh %1,%2,%3\n\tadds %0,%0,%4\n\tadc %1,%1,xzr"
: "=&r"(res), "=&r"(overflow)
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index 519ff5b8d8..a479bdba6f 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -411,10 +411,10 @@ ZEND_FUNCTION(func_get_arg)
{
int arg_count, first_extra_arg;
zval *arg;
- long requested_offset;
+ zend_int_t requested_offset;
zend_execute_data *ex;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &requested_offset) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &requested_offset) == FAILURE) {
return;
}
@@ -1907,7 +1907,7 @@ ZEND_FUNCTION(zend_test_func)
#ifdef ZTS
ZEND_FUNCTION(zend_thread_id)
{
- RETURN_INT((long)tsrm_thread_id());
+ RETURN_INT((zend_int_t)tsrm_thread_id());
}
#endif
#endif
@@ -2111,10 +2111,10 @@ ZEND_FUNCTION(debug_print_backtrace)
const char *include_filename = NULL;
zval arg_array;
int indent = 0;
- long options = 0;
- long limit = 0;
+ zend_int_t options = 0;
+ zend_int_t limit = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &options, &limit) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ii", &options, &limit) == FAILURE) {
return;
}
@@ -2499,10 +2499,10 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int
Return backtrace as array */
ZEND_FUNCTION(debug_backtrace)
{
- long options = DEBUG_BACKTRACE_PROVIDE_OBJECT;
- long limit = 0;
+ zend_int_t options = DEBUG_BACKTRACE_PROVIDE_OBJECT;
+ zend_int_t limit = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ll", &options, &limit) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ii", &options, &limit) == FAILURE) {
return;
}
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 5d14d4a1b6..120cc98da5 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2539,7 +2539,7 @@ int zend_do_begin_class_member_function_call(znode *class_name, znode *method_na
}
/* }}} */
-static int zend_do_convert_call(zend_op *init_opline, zend_op *opline, long num_args, zend_function **func_ptr TSRMLS_DC) /* {{{ */
+static int zend_do_convert_call(zend_op *init_opline, zend_op *opline, zend_int_t num_args, zend_function **func_ptr TSRMLS_DC) /* {{{ */
{
zval *function_name;
zend_string *lcname;
@@ -6312,7 +6312,7 @@ void zend_do_end_array(znode *result, const znode *array_node TSRMLS_DC) /* {{{
if (constant_array) {
/* try to construct constant array */
zend_uint size;
- long num;
+ zend_int_t num;
zend_string *str;
if (init_opline->op1_type != IS_UNUSED) {
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
index 693c65676d..9c52056d10 100644
--- a/Zend/zend_constants.c
+++ b/Zend/zend_constants.c
@@ -323,7 +323,7 @@ ZEND_API zval *zend_get_constant(zend_string *name TSRMLS_DC)
return c ? &c->value : NULL;
}
-ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, ulong flags TSRMLS_DC)
+ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, zend_uint_t flags TSRMLS_DC)
{
zend_constant *c;
const char *colon;
@@ -449,7 +449,7 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope,
}
}
-zend_constant *zend_quick_get_constant(const zval *key, ulong flags TSRMLS_DC)
+zend_constant *zend_quick_get_constant(const zval *key, zend_uint_t flags TSRMLS_DC)
{
zend_constant *c;
diff --git a/Zend/zend_constants.h b/Zend/zend_constants.h
index 11a12cbfa7..d36584d20f 100644
--- a/Zend/zend_constants.h
+++ b/Zend/zend_constants.h
@@ -67,7 +67,7 @@ void zend_register_standard_constants(TSRMLS_D);
void clean_non_persistent_constants(TSRMLS_D);
ZEND_API zval *zend_get_constant(zend_string *name TSRMLS_DC);
ZEND_API zval *zend_get_constant_str(const char *name, uint name_len TSRMLS_DC);
-ZEND_API zval *zend_get_constant_ex(zend_string *name, zend_class_entry *scope, ulong flags TSRMLS_DC);
+ZEND_API zval *zend_get_constant_ex(zend_string *name, zend_class_entry *scope, zend_uint_t flags TSRMLS_DC);
ZEND_API void zend_register_bool_constant(const char *name, uint name_len, zend_bool bval, int flags, int module_number TSRMLS_DC);
ZEND_API void zend_register_null_constant(const char *name, uint name_len, int flags, int module_number TSRMLS_DC);
ZEND_API void zend_register_int_constant(const char *name, uint name_len, zend_int_t lval, int flags, int module_number TSRMLS_DC);
@@ -76,7 +76,7 @@ ZEND_API void zend_register_string_constant(const char *name, uint name_len, cha
ZEND_API void zend_register_stringl_constant(const char *name, uint name_len, char *strval, uint strlen, int flags, int module_number TSRMLS_DC);
ZEND_API int zend_register_constant(zend_constant *c TSRMLS_DC);
void zend_copy_constants(HashTable *target, HashTable *sourc);
-zend_constant *zend_quick_get_constant(const zval *key, ulong flags TSRMLS_DC);
+zend_constant *zend_quick_get_constant(const zval *key, zend_uint_t flags TSRMLS_DC);
END_EXTERN_C()
#define ZEND_CONSTANT_DTOR free_zend_constant
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 401a85f870..9fda5d4289 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -459,7 +459,7 @@ static void _build_trace_args(zval *arg, zend_string **str_ptr TSRMLS_DC) /* {{{
TRACE_APPEND_STR("true, ");
break;
case IS_RESOURCE: {
- long lval = Z_RES_HANDLE_P(arg);
+ zend_int_t lval = Z_RES_HANDLE_P(arg);
char s_tmp[MAX_LENGTH_OF_ZEND_INT + 1];
int l_tmp = zend_sprintf(s_tmp, "%ld", lval); /* SAFE */
TRACE_APPEND_STR("Resource id #");
@@ -468,7 +468,7 @@ static void _build_trace_args(zval *arg, zend_string **str_ptr TSRMLS_DC) /* {{{
break;
}
case IS_INT: {
- long lval = Z_IVAL_P(arg);
+ zend_int_t lval = Z_IVAL_P(arg);
char s_tmp[MAX_LENGTH_OF_ZEND_INT + 1];
int l_tmp = zend_sprintf(s_tmp, "%ld", lval); /* SAFE */
TRACE_APPEND_STRL(s_tmp, l_tmp);
@@ -509,7 +509,7 @@ static void _build_trace_args(zval *arg, zend_string **str_ptr TSRMLS_DC) /* {{{
}
/* }}} */
-static void _build_trace_string(zval *frame, ulong index, zend_string **str_ptr, int *num TSRMLS_DC) /* {{{ */
+static void _build_trace_string(zval *frame, zend_uint_t index, zend_string **str_ptr, int *num TSRMLS_DC) /* {{{ */
{
char *s_tmp;
int len;
@@ -584,7 +584,7 @@ static void _build_trace_string(zval *frame, ulong index, zend_string **str_ptr,
ZEND_METHOD(exception, getTraceAsString)
{
zval *trace, *frame;
- ulong index;
+ zend_uint_t index;
zend_string *str, *key;
int num = 0, len;
char s_tmp[MAX_LENGTH_OF_ZEND_INT + 7 + 1 + 1];
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 2f7e107cef..8ef2cb2f81 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -48,7 +48,7 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s
ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC);
ZEND_API int zend_eval_stringl_ex(char *str, int str_len, zval *retval_ptr, char *string_name, int handle_exceptions TSRMLS_DC);
-ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, ulong fetch_type, char **class_name, zend_class_entry **pce TSRMLS_DC);
+ZEND_API char * zend_verify_arg_class_kind(const zend_arg_info *cur_arg_info, zend_uint_t fetch_type, char **class_name, zend_class_entry **pce TSRMLS_DC);
ZEND_API void zend_verify_arg_error(int error_type, const zend_function *zf, zend_uint arg_num, const char *need_msg, const char *need_kind, const char *given_msg, const char *given_kind, zval *arg TSRMLS_DC);
static zend_always_inline void i_zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC TSRMLS_DC)
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 1b33903723..eba2d39c5f 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1680,7 +1680,7 @@ ZEND_API int zend_set_local_var(zend_string *name, zval *value, int force TSRMLS
if (execute_data) {
if (!execute_data->symbol_table) {
- zend_ulong h = STR_HASH_VAL(name);
+ zend_uint_t h = STR_HASH_VAL(name);
zend_op_array *op_array = &execute_data->func->op_array;
int i;
@@ -1716,7 +1716,7 @@ ZEND_API int zend_set_local_var_str(const char *name, int len, zval *value, int
if (execute_data) {
if (!execute_data->symbol_table) {
- zend_ulong h = zend_hash_func(name, len);
+ zend_uint_t h = zend_hash_func(name, len);
zend_op_array *op_array = &execute_data->func->op_array;
int i;
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index f69b512d52..ffde058e0b 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1645,7 +1645,7 @@ yy61:
yyleng = YYCURSOR - SCNG(yy_text);
#line 2153 "Zend/zend_language_scanner.l"
{
- Z_IVAL_P(zendlval) = (long) '{';
+ Z_IVAL_P(zendlval) = (zend_int_t) '{';
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
yyless(1);
return T_CURLY_OPEN;
@@ -1873,7 +1873,7 @@ yy83:
yyleng = YYCURSOR - SCNG(yy_text);
#line 2153 "Zend/zend_language_scanner.l"
{
- Z_IVAL_P(zendlval) = (long) '{';
+ Z_IVAL_P(zendlval) = (zend_int_t) '{';
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
yyless(1);
return T_CURLY_OPEN;
@@ -2132,7 +2132,7 @@ yy107:
yyleng = YYCURSOR - SCNG(yy_text);
#line 2153 "Zend/zend_language_scanner.l"
{
- Z_IVAL_P(zendlval) = (long) '{';
+ Z_IVAL_P(zendlval) = (zend_int_t) '{';
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
yyless(1);
return T_CURLY_OPEN;
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 36aeee65d6..b6cad8f217 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -2151,7 +2151,7 @@ inline_html:
<ST_DOUBLE_QUOTES,ST_BACKQUOTE,ST_HEREDOC>"{$" {
- Z_IVAL_P(zendlval) = (long) '{';
+ Z_IVAL_P(zendlval) = (zend_int_t) '{';
yy_push_state(ST_IN_SCRIPTING TSRMLS_CC);
yyless(1);
return T_CURLY_OPEN;
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
index 587346c267..7f1c6c18ec 100644
--- a/Zend/zend_multiply.h
+++ b/Zend/zend_multiply.h
@@ -81,7 +81,7 @@
} \
} while (0)
-#elif SIZEOF_LONG == 4 && defined(HAVE_ZEND_LONG64)
+#elif SIZEOF_ZEND_INT == 4 && defined(HAVE_ZEND_LONG64)
#define ZEND_SIGNED_MULTIPLY_INT(a, b, lval, dval, usedval) do { \
zend_long64 __result = (zend_long64) (a) * (zend_long64) (b); \
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c
index af0070c5fb..c254b33fb2 100644
--- a/Zend/zend_objects.c
+++ b/Zend/zend_objects.c
@@ -149,7 +149,7 @@ ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object *o
}
if (old_object->properties) {
zval *prop, new_prop;
- ulong num_key;
+ zend_uint_t num_key;
zend_string *key;
if (!new_object->properties) {
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
index 4546614cfd..f34502054a 100644
--- a/Zend/zend_strtod.c
+++ b/Zend/zend_strtod.c
@@ -174,7 +174,7 @@ typedef unsigned long int uint32_t;
#endif
#define Long int32_t
-#define ULong uint32_t
+#define zend_uint_t uint32_t
#ifdef __cplusplus
#include "malloc.h"
@@ -272,7 +272,7 @@ BEGIN_EXTERN_C()
typedef union {
double d;
- ULong ul[2];
+ zend_uint_t ul[2];
} _double;
#define value(x) ((x).d)
#ifdef IEEE_LITTLE_ENDIAN
@@ -418,7 +418,7 @@ extern double rnd_prod(double, double), rnd_quot(double, double);
struct Bigint {
struct Bigint *next;
int k, maxwds, sign, wds;
- ULong x[1];
+ zend_uint_t x[1];
};
typedef struct Bigint Bigint;
@@ -519,9 +519,9 @@ static void Bfree(Bigint *v)
static char * rv_alloc(int i) {
int j, k, *r;
- j = sizeof(ULong);
+ j = sizeof(zend_uint_t);
for(k = 0;
- sizeof(Bigint) - sizeof(ULong) - sizeof(int) + j <= i;
+ sizeof(Bigint) - sizeof(zend_uint_t) - sizeof(int) + j <= i;
j <<= 1) {
k++;
}
@@ -548,9 +548,9 @@ static char * nrv_alloc(char *s, char **rve, int n)
static Bigint * multadd(Bigint *b, int m, int a) /* multiply by m and add a */
{
int i, wds;
- ULong *x, y;
+ zend_uint_t *x, y;
#ifdef Pack_32
- ULong xi, z;
+ zend_uint_t xi, z;
#endif
Bigint *b1;
@@ -584,7 +584,7 @@ static Bigint * multadd(Bigint *b, int m, int a) /* multiply by m and add a */
return b;
}
-static int hi0bits(ULong x)
+static int hi0bits(zend_uint_t x)
{
int k = 0;
@@ -613,10 +613,10 @@ static int hi0bits(ULong x)
return k;
}
-static int lo0bits(ULong *y)
+static int lo0bits(zend_uint_t *y)
{
int k;
- ULong x = *y;
+ zend_uint_t x = *y;
if (x & 7) {
if (x & 1) {
@@ -671,10 +671,10 @@ static Bigint * mult(Bigint *a, Bigint *b)
{
Bigint *c;
int k, wa, wb, wc;
- ULong carry, y, z;
- ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
+ zend_uint_t carry, y, z;
+ zend_uint_t *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
#ifdef Pack_32
- ULong z2;
+ zend_uint_t z2;
#endif
if (a->wds < b->wds) {
@@ -751,7 +751,7 @@ static Bigint * mult(Bigint *a, Bigint *b)
return c;
}
-static Bigint * s2b (CONST char *s, int nd0, int nd, ULong y9)
+static Bigint * s2b (CONST char *s, int nd0, int nd, zend_uint_t y9)
{
Bigint *b;
int i, k;
@@ -830,7 +830,7 @@ static Bigint *lshift(Bigint *b, int k)
{
int i, k1, n, n1;
Bigint *b1;
- ULong *x, *x1, *xe, z;
+ zend_uint_t *x, *x1, *xe, z;
#ifdef Pack_32
n = k >> 5;
@@ -886,7 +886,7 @@ static Bigint *lshift(Bigint *b, int k)
static int cmp(Bigint *a, Bigint *b)
{
- ULong *xa, *xa0, *xb, *xb0;
+ zend_uint_t *xa, *xa0, *xb, *xb0;
int i, j;
i = a->wds;
@@ -918,7 +918,7 @@ static Bigint * diff(Bigint *a, Bigint *b)
Bigint *c;
int i, wa, wb;
Long borrow, y; /* We need signed shifts here. */
- ULong *xa, *xae, *xb, *xbe, *xc;
+ zend_uint_t *xa, *xae, *xb, *xbe, *xc;
#ifdef Pack_32
Long z;
#endif
@@ -1030,11 +1030,11 @@ b2d
(Bigint *a, int *e)
#endif
{
- ULong *xa, *xa0, w, y, z;
+ zend_uint_t *xa, *xa0, w, y, z;
int k;
volatile _double d;
#ifdef VAX
- ULong d0, d1;
+ zend_uint_t d0, d1;
#else
#define d0 word0(d)
#define d1 word1(d)
@@ -1097,10 +1097,10 @@ static Bigint * d2b(double _d, int *e, int *bits)
{
Bigint *b;
int de, i, k;
- ULong *x, y, z;
+ zend_uint_t *x, y, z;
volatile _double d;
#ifdef VAX
- ULong d0, d1;
+ zend_uint_t d0, d1;
#endif
value(d) = _d;
@@ -1283,11 +1283,11 @@ static int quorem(Bigint *b, Bigint *S)
{
int n;
Long borrow, y;
- ULong carry, q, ys;
- ULong *bx, *bxe, *sx, *sxe;
+ zend_uint_t carry, q, ys;
+ zend_uint_t *bx, *bxe, *sx, *sxe;
#ifdef Pack_32
Long z;
- ULong si, zs;
+ zend_uint_t si, zs;
#endif
n = S->wds;
@@ -1481,7 +1481,7 @@ ZEND_API char * zend_dtoa(double _d, int mode, int ndigits, int *decpt, int *sig
Long L;
#ifndef Sudden_Underflow
int denorm;
- ULong x;
+ zend_uint_t x;
#endif
Bigint *b, *b1, *delta, *mlo, *mhi, *S, *tmp;
double ds;
@@ -2044,7 +2044,7 @@ ZEND_API double zend_strtod (CONST char *s00, CONST char **se)
volatile double aadj, aadj1, adj;
volatile _double rv, rv0;
Long L;
- ULong y, z;
+ zend_uint_t y, z;
Bigint *bb, *bb1, *bd, *bd0, *bs, *delta, *tmp;
double result;
diff --git a/ext/standard/filters.c b/ext/standard/filters.c
index b595252cc5..f794cbad38 100644
--- a/ext/standard/filters.c
+++ b/ext/standard/filters.c
@@ -1232,7 +1232,7 @@ static php_conv_err_t php_conv_get_string_prop_ex(const HashTable *ht, char **pr
}
#if IT_WAS_USED
-static php_conv_err_t php_conv_get_long_prop_ex(const HashTable *ht, long *pretval, char *field_name, size_t field_name_len)
+static php_conv_err_t php_conv_get_long_prop_ex(const HashTable *ht, php_int_t *pretval, char *field_name, size_t field_name_len)
{
zval **tmpval;
@@ -1255,7 +1255,7 @@ static php_conv_err_t php_conv_get_long_prop_ex(const HashTable *ht, long *pretv
}
#endif
-static php_conv_err_t php_conv_get_ulong_prop_ex(const HashTable *ht, unsigned long *pretval, char *field_name, size_t field_name_len)
+static php_conv_err_t php_conv_get_ulong_prop_ex(const HashTable *ht, php_uint_t *pretval, char *field_name, size_t field_name_len)
{
zval *tmpval;
diff --git a/ext/standard/html.c b/ext/standard/html.c
index 97e121c02a..e729c1245d 100644
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -856,7 +856,7 @@ static inline int process_named_entity_html(const char **buf, const char **start
static inline int resolve_named_entity_html(const char *start, size_t length, const entity_ht *ht, unsigned *uni_cp1, unsigned *uni_cp2)
{
const entity_cp_map *s;
- ulong hash = zend_inline_hash_func(start, length);
+ php_uint_t hash = zend_inline_hash_func(start, length);
s = ht->buckets[hash % ht->num_elems];
while (s->entity) {
diff --git a/ext/standard/http.c b/ext/standard/http.c
index a3eb8246d3..27642da738 100644
--- a/ext/standard/http.c
+++ b/ext/standard/http.c
@@ -35,7 +35,7 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
char *newprefix, *p;
const char *prop_name;
int arg_sep_len, newprefix_len, prop_len;
- ulong idx;
+ php_uint_t idx;
zval *zdata = NULL, copyzval;
if (!ht) {
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 15ecd0433a..27bc683ba5 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -196,7 +196,7 @@ static void php_print_gpcse_array(char *name, uint name_length TSRMLS_DC)
{
zval *data, *tmp, tmp2;
zend_string *string_key;
- ulong num_key;
+ php_uint_t num_key;
zend_string *key;
key = STR_INIT(name, name_length, 0);
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
index 84986c2e03..cd74ecac51 100644
--- a/ext/standard/proc_open.c
+++ b/ext/standard/proc_open.c
@@ -427,7 +427,7 @@ PHP_FUNCTION(proc_open)
int i;
zval *descitem = NULL;
zend_string *str_index;
- ulong nindex;
+ php_uint_t nindex;
struct php_proc_open_descriptor_item descriptors[PHP_PROC_OPEN_MAX_DESCRIPTORS];
#ifdef PHP_WIN32
PROCESS_INFORMATION pi;
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 88c16469a1..95c4c49aec 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -619,7 +619,7 @@ static int stream_array_from_fd_set(zval *stream_array, fd_set *fds TSRMLS_DC)
php_stream *stream;
int ret = 0;
zend_string *key;
- ulong num_ind;
+ php_uint_t num_ind;
if (Z_TYPE_P(stream_array) != IS_ARRAY) {
return 0;
diff --git a/ext/standard/var.c b/ext/standard/var.c
index fb82b50c5e..f757b26fb1 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -54,7 +54,7 @@ static uint zend_obj_num_elements(HashTable *ht)
return num;
}
-static void php_array_element_dump(zval *zv, ulong index, zend_string *key, int level TSRMLS_DC) /* {{{ */
+static void php_array_element_dump(zval *zv, php_uint_t index, zend_string *key, int level TSRMLS_DC) /* {{{ */
{
if (key == NULL) { /* numeric key */
php_printf("%*c[%ld]=>\n", level + 1, ' ', index);
@@ -67,7 +67,7 @@ static void php_array_element_dump(zval *zv, ulong index, zend_string *key, int
}
/* }}} */
-static void php_object_property_dump(zval *zv, ulong index, zend_string *key, int level TSRMLS_DC) /* {{{ */
+static void php_object_property_dump(zval *zv, php_uint_t index, zend_string *key, int level TSRMLS_DC) /* {{{ */
{
const char *prop_name, *class_name;
@@ -100,7 +100,7 @@ PHPAPI void php_var_dump(zval *struc, int level TSRMLS_DC) /* {{{ */
zend_string *class_name;
int is_temp;
int is_ref = 0;
- ulong num;
+ php_uint_t num;
zend_string *key;
zval *val;
@@ -171,7 +171,7 @@ again:
php_printf("%sobject(unknown class)#%d (%d) {\n", COMMON, Z_OBJ_HANDLE_P(struc), myht ? zend_obj_num_elements(myht) : 0);
}
if (myht) {
- ulong num;
+ php_uint_t num;
zend_string *key;
zval *val;
@@ -227,7 +227,7 @@ PHP_FUNCTION(var_dump)
}
/* }}} */
-static void zval_array_element_dump(zval *zv, ulong index, zend_string *key, int level TSRMLS_DC) /* {{{ */
+static void zval_array_element_dump(zval *zv, php_uint_t index, zend_string *key, int level TSRMLS_DC) /* {{{ */
{
if (key == NULL) { /* numeric key */
php_printf("%*c[%ld]=>\n", level + 1, ' ', index);
@@ -240,7 +240,7 @@ static void zval_array_element_dump(zval *zv, ulong index, zend_string *key, int
}
/* }}} */
-static void zval_object_property_dump(zval *zv, ulong index, zend_string *key, int level TSRMLS_DC) /* {{{ */
+static void zval_object_property_dump(zval *zv, php_uint_t index, zend_string *key, int level TSRMLS_DC) /* {{{ */
{
const char *prop_name, *class_name;
@@ -271,7 +271,7 @@ PHPAPI void php_debug_zval_dump(zval *struc, int level TSRMLS_DC) /* {{{ */
zend_string *class_name;
int is_temp = 0;
int is_ref = 0;
- ulong index;
+ php_uint_t index;
zend_string *key;
zval *val;
@@ -398,7 +398,7 @@ PHP_FUNCTION(debug_zval_dump)
efree(tmp_spaces); \
} while(0);
-static void php_array_element_export(zval *zv, ulong index, zend_string *key, int level, smart_str *buf TSRMLS_DC) /* {{{ */
+static void php_array_element_export(zval *zv, php_uint_t index, zend_string *key, int level, smart_str *buf TSRMLS_DC) /* {{{ */
{
if (key == NULL) { /* numeric key */
buffer_append_spaces(buf, level+1);
@@ -426,7 +426,7 @@ static void php_array_element_export(zval *zv, ulong index, zend_string *key, in
}
/* }}} */
-static void php_object_element_export(zval *zv, ulong index, zend_string *key, int level, smart_str *buf TSRMLS_DC) /* {{{ */
+static void php_object_element_export(zval *zv, php_uint_t index, zend_string *key, int level, smart_str *buf TSRMLS_DC) /* {{{ */
{
buffer_append_spaces(buf, level + 2);
if (key != NULL) {
@@ -459,7 +459,7 @@ PHPAPI void php_var_export_ex(zval *struc, int level, smart_str *buf TSRMLS_DC)
int tmp_len;
zend_string *class_name;
zend_string *ztmp, *ztmp2;
- ulong index;
+ php_uint_t index;
zend_string *key;
zval *val;
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 968598aa18..1f43bca846 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -30,13 +30,13 @@
typedef struct {
zval *data[VAR_ENTRIES_MAX];
- long used_slots;
+ php_int_t used_slots;
void *next;
} var_entries;
typedef struct {
zval data[VAR_ENTRIES_MAX];
- long used_slots;
+ php_int_t used_slots;
void *next;
} var_dtor_entries;
@@ -119,7 +119,7 @@ PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rva
PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval *nzval)
{
- long i;
+ php_int_t i;
var_entries *var_hash = (*var_hashx)->first;
#if VAR_ENTRIES_DBG
fprintf(stderr, "var_replace(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(nzval));
@@ -136,7 +136,7 @@ PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval *nz
}
}
-static zval *var_access(php_unserialize_data_t *var_hashx, long id)
+static zval *var_access(php_unserialize_data_t *var_hashx, php_int_t id)
{
var_entries *var_hash = (*var_hashx)->first;
#if VAR_ENTRIES_DBG
@@ -158,7 +158,7 @@ static zval *var_access(php_unserialize_data_t *var_hashx, long id)
PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
{
void *next;
- long i;
+ php_int_t i;
var_entries *var_hash = (*var_hashx)->first;
var_dtor_entries *var_dtor_hash = (*var_hashx)->first_dtor;
#if VAR_ENTRIES_DBG
@@ -238,10 +238,10 @@ static zend_string *unserialize_str(const unsigned char **p, size_t len, size_t
-static inline long parse_iv2(const unsigned char *p, const unsigned char **q)
+static inline php_int_t parse_iv2(const unsigned char *p, const unsigned char **q)
{
char cursor;
- long result = 0;
+ php_int_t result = 0;
int neg = 0;
switch (*p) {
@@ -266,7 +266,7 @@ static inline long parse_iv2(const unsigned char *p, const unsigned char **q)
return result;
}
-static inline long parse_iv(const unsigned char *p)
+static inline php_int_t parse_iv(const unsigned char *p)
{
return parse_iv2(p, NULL);
}
@@ -296,7 +296,7 @@ static inline size_t parse_uiv(const unsigned char *p)
#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC
#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash TSRMLS_CC
-static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements, int objprops)
+static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, php_int_t elements, int objprops)
{
while (elements-- > 0) {
zval key, *data, d, *old_data;
@@ -380,14 +380,14 @@ static inline int finish_nested_data(UNSERIALIZE_PARAMETER)
static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
{
- long datalen;
+ php_int_t datalen;
datalen = parse_iv2((*p) + 2, p);
(*p) += 2;
if (datalen < 0 || (*p) + datalen >= max) {
- zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p)));
+ zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (php_int_t)(max - (*p)));
return 0;
}
@@ -403,9 +403,9 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
+static inline php_int_t object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
{
- long elements;
+ php_int_t elements;
elements = parse_iv2((*p) + 2, p);
@@ -426,7 +426,7 @@ static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
#ifdef PHP_WIN32
# pragma optimize("", off)
#endif
-static inline int object_common2(UNSERIALIZE_PARAMETER, long elements)
+static inline int object_common2(UNSERIALIZE_PARAMETER, php_int_t elements)
{
zval retval;
zval fname;
@@ -625,7 +625,7 @@ yy20:
#line 681 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
- long elements;
+ php_int_t elements;
char *str;
zend_string *class_name;
zend_class_entry *ce;
@@ -817,7 +817,7 @@ yy34:
++YYCURSOR;
#line 652 "ext/standard/var_unserializer.re"
{
- long elements = parse_iv(start + 2);
+ php_int_t elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
*p = YYCURSOR;
@@ -1023,7 +1023,7 @@ yy63:
++YYCURSOR;
#line 588 "ext/standard/var_unserializer.re"
{
-#if SIZEOF_LONG == 4
+#if SIZEOF_ZEND_INT == 4
use_double:
#endif
*p = YYCURSOR;
@@ -1134,14 +1134,14 @@ yy79:
++YYCURSOR;
#line 546 "ext/standard/var_unserializer.re"
{
-#if SIZEOF_LONG == 4
+#if SIZEOF_ZEND_INT == 4
int digits = YYCURSOR - start - 3;
if (start[2] == '-' || start[2] == '+') {
digits--;
}
- /* Use double for large long values that were serialized on a 64-bit system */
+ /* Use double for large php_int_t values that were serialized on a 64-bit system */
if (digits >= MAX_LENGTH_OF_ZEND_INT - 1) {
if (digits == MAX_LENGTH_OF_ZEND_INT - 1) {
int cmp = strncmp((char*)YYCURSOR - MAX_LENGTH_OF_ZEND_INT, int_min_digits, MAX_LENGTH_OF_ZEND_INT - 1);
@@ -1206,7 +1206,7 @@ yy91:
++YYCURSOR;
#line 511 "ext/standard/var_unserializer.re"
{
- long id;
+ php_int_t id;
*p = YYCURSOR;
if (!var_hash) return 0;
@@ -1252,7 +1252,7 @@ yy97:
++YYCURSOR;
#line 489 "ext/standard/var_unserializer.re"
{
- long id;
+ php_int_t id;
*p = YYCURSOR;
if (!var_hash) return 0;
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 8eef32308c..40876563a8 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -28,13 +28,13 @@
typedef struct {
zval *data[VAR_ENTRIES_MAX];
- long used_slots;
+ php_int_t used_slots;
void *next;
} var_entries;
typedef struct {
zval data[VAR_ENTRIES_MAX];
- long used_slots;
+ php_int_t used_slots;
void *next;
} var_dtor_entries;
@@ -117,7 +117,7 @@ PHPAPI void var_push_dtor_no_addref(php_unserialize_data_t *var_hashx, zval *rva
PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval *nzval)
{
- long i;
+ php_int_t i;
var_entries *var_hash = (*var_hashx)->first;
#if VAR_ENTRIES_DBG
fprintf(stderr, "var_replace(%ld): %d\n", var_hash?var_hash->used_slots:-1L, Z_TYPE_PP(nzval));
@@ -134,7 +134,7 @@ PHPAPI void var_replace(php_unserialize_data_t *var_hashx, zval *ozval, zval *nz
}
}
-static zval *var_access(php_unserialize_data_t *var_hashx, long id)
+static zval *var_access(php_unserialize_data_t *var_hashx, php_int_t id)
{
var_entries *var_hash = (*var_hashx)->first;
#if VAR_ENTRIES_DBG
@@ -156,7 +156,7 @@ static zval *var_access(php_unserialize_data_t *var_hashx, long id)
PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
{
void *next;
- long i;
+ php_int_t i;
var_entries *var_hash = (*var_hashx)->first;
var_dtor_entries *var_dtor_hash = (*var_hashx)->first_dtor;
#if VAR_ENTRIES_DBG
@@ -242,10 +242,10 @@ object = [OC];
-static inline long parse_iv2(const unsigned char *p, const unsigned char **q)
+static inline php_int_t parse_iv2(const unsigned char *p, const unsigned char **q)
{
char cursor;
- long result = 0;
+ php_int_t result = 0;
int neg = 0;
switch (*p) {
@@ -270,7 +270,7 @@ static inline long parse_iv2(const unsigned char *p, const unsigned char **q)
return result;
}
-static inline long parse_iv(const unsigned char *p)
+static inline php_int_t parse_iv(const unsigned char *p)
{
return parse_iv2(p, NULL);
}
@@ -300,7 +300,7 @@ static inline size_t parse_uiv(const unsigned char *p)
#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC
#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash TSRMLS_CC
-static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, long elements, int objprops)
+static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, php_int_t elements, int objprops)
{
while (elements-- > 0) {
zval key, *data, d, *old_data;
@@ -384,14 +384,14 @@ static inline int finish_nested_data(UNSERIALIZE_PARAMETER)
static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
{
- long datalen;
+ php_int_t datalen;
datalen = parse_iv2((*p) + 2, p);
(*p) += 2;
if (datalen < 0 || (*p) + datalen >= max) {
- zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p)));
+ zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (php_int_t)(max - (*p)));
return 0;
}
@@ -407,9 +407,9 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
+static inline php_int_t object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
{
- long elements;
+ php_int_t elements;
elements = parse_iv2((*p) + 2, p);
@@ -430,7 +430,7 @@ static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
#ifdef PHP_WIN32
# pragma optimize("", off)
#endif
-static inline int object_common2(UNSERIALIZE_PARAMETER, long elements)
+static inline int object_common2(UNSERIALIZE_PARAMETER, php_int_t elements)
{
zval retval;
zval fname;
@@ -487,7 +487,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
/*!re2c
"R:" iv ";" {
- long id;
+ php_int_t id;
*p = YYCURSOR;
if (!var_hash) return 0;
@@ -509,7 +509,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
}
"r:" iv ";" {
- long id;
+ php_int_t id;
*p = YYCURSOR;
if (!var_hash) return 0;
@@ -544,14 +544,14 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
}
"i:" iv ";" {
-#if SIZEOF_LONG == 4
+#if SIZEOF_ZEND_INT == 4
int digits = YYCURSOR - start - 3;
if (start[2] == '-' || start[2] == '+') {
digits--;
}
- /* Use double for large long values that were serialized on a 64-bit system */
+ /* Use double for large php_int_t values that were serialized on a 64-bit system */
if (digits >= MAX_LENGTH_OF_ZEND_INT - 1) {
if (digits == MAX_LENGTH_OF_ZEND_INT - 1) {
int cmp = strncmp((char*)YYCURSOR - MAX_LENGTH_OF_ZEND_INT, int_min_digits, MAX_LENGTH_OF_ZEND_INT - 1);
@@ -586,7 +586,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
}
"d:" (iv | nv | nvexp) ";" {
-#if SIZEOF_LONG == 4
+#if SIZEOF_ZEND_INT == 4
use_double:
#endif
*p = YYCURSOR;
@@ -650,7 +650,7 @@ use_double:
}
"a:" uiv ":" "{" {
- long elements = parse_iv(start + 2);
+ php_int_t elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
*p = YYCURSOR;
@@ -680,7 +680,7 @@ use_double:
object ":" uiv ":" ["] {
size_t len, len2, len3, maxlen;
- long elements;
+ php_int_t elements;
char *str;
zend_string *class_name;
zend_class_entry *ce;