Skip to content

Commit 1433162

Browse files
dstogovdstogov
committed
Fixed compilation warnings
1 parent ccf4ae9 commit 1433162

20 files changed

+71
-72
lines changed

‎Zend/zend_API.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ END_EXTERN_C()
567567
#endif
568568

569569
#define CHECK_ZVAL_NULL_PATH(p) (Z_STRLEN_P(p) != strlen(Z_STRVAL_P(p)))
570-
#define CHECK_NULL_PATH(p, l) (strlen(p) != l)
570+
#define CHECK_NULL_PATH(p, l) (strlen(p) != (size_t)(l))
571571

572572
#define ZVAL_STRINGL(z, s, l) do { \
573573
ZVAL_NEW_STR(z, zend_string_init(s, l, 0)); \

‎ext/opcache/Optimizer/compact_literals.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
283283
break;
284284
case ZEND_RECV_INIT:
285285
LITERAL_INFO(opline->op2.constant, LITERAL_VALUE, 0, 0, 1);
286-
if (Z_CACHE_SLOT(op_array->literals[opline->op2.constant]) != -1) {
286+
if (Z_CACHE_SLOT(op_array->literals[opline->op2.constant]) != (uint32_t)-1) {
287287
Z_CACHE_SLOT(op_array->literals[opline->op2.constant]) = cache_size;
288288
cache_size += sizeof(void *);
289289
}
@@ -297,7 +297,7 @@ void zend_optimizer_compact_literals(zend_op_array *op_array, zend_optimizer_ctx
297297
case ZEND_RECV:
298298
case ZEND_RECV_VARIADIC:
299299
case ZEND_VERIFY_RETURN_TYPE:
300-
if (opline->op2.num != -1) {
300+
if (opline->op2.num != (uint32_t)-1) {
301301
opline->op2.num = cache_size;
302302
cache_size += sizeof(void *);
303303
}

‎ext/opcache/Optimizer/zend_cfg.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static void zend_mark_reachable_blocks(const zend_op_array *op_array, zend_cfg *
112112
b->start++;
113113
b->len--;
114114
}
115-
if (b->len == 0 && b->successors[0] == block_map[live_range->end]) {
115+
if (b->len == 0 && (uint32_t)b->successors[0] == block_map[live_range->end]) {
116116
/* mark as removed (empty live range) */
117117
live_range->var = (uint32_t)-1;
118118
continue;

‎ext/opcache/Optimizer/zend_dfg.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ int zend_build_dfg(const zend_op_array *op_array, const zend_cfg *cfg, zend_dfg
2626
zend_basic_block *blocks = cfg->blocks;
2727
int blocks_count = cfg->blocks_count;
2828
zend_bitset tmp, def, use, in, out;
29-
uint32_t k, var_num;
29+
int k;
30+
uint32_t var_num;
3031
int j;
3132

3233
set_size = dfg->size;

‎ext/opcache/Optimizer/zend_dump.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -887,10 +887,12 @@ void zend_dump_op_array(const zend_op_array *op_array, uint32_t dump_flags, cons
887887
fprintf(stderr, " ; %s:%u-%u\n", op_array->filename->val, op_array->line_start, op_array->line_end);
888888

889889
if (func_info && func_info->num_args > 0) {
890-
for (i = 0; i < MIN(op_array->num_args, func_info->num_args ); i++) {
891-
fprintf(stderr, " ; arg %d ", i);
892-
zend_dump_type_info(func_info->arg_info[i].info.type, func_info->arg_info[i].info.ce, func_info->arg_info[i].info.is_instanceof, dump_flags);
893-
zend_dump_range(&func_info->arg_info[i].info.range);
890+
uint32_t j;
891+
892+
for (j = 0; j < MIN(op_array->num_args, func_info->num_args ); j++) {
893+
fprintf(stderr, " ; arg %d ", j);
894+
zend_dump_type_info(func_info->arg_info[j].info.type, func_info->arg_info[j].info.ce, func_info->arg_info[j].info.is_instanceof, dump_flags);
895+
zend_dump_range(&func_info->arg_info[j].info.range);
894896
fprintf(stderr, "\n");
895897
}
896898
}

‎ext/opcache/Optimizer/zend_func_info.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ typedef struct _func_info_t {
5353

5454
static uint32_t zend_strlen_info(const zend_call_info *call_info, const zend_ssa *ssa)
5555
{
56-
if (call_info->caller_init_opline->extended_value == call_info->num_args &&
56+
if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args &&
5757
call_info->num_args == 1) {
5858

5959
uint32_t tmp = MAY_BE_RC1;
@@ -83,7 +83,7 @@ static uint32_t zend_strlen_info(const zend_call_info *call_info, const zend_ssa
8383

8484
static uint32_t zend_dechex_info(const zend_call_info *call_info, const zend_ssa *ssa)
8585
{
86-
if (call_info->caller_init_opline->extended_value == call_info->num_args &&
86+
if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args &&
8787
call_info->num_args == 1) {
8888
return MAY_BE_RC1 | MAY_BE_STRING;
8989
} else {
@@ -94,7 +94,7 @@ static uint32_t zend_dechex_info(const zend_call_info *call_info, const zend_ssa
9494

9595
static uint32_t zend_range_info(const zend_call_info *call_info, const zend_ssa *ssa)
9696
{
97-
if (call_info->caller_init_opline->extended_value == call_info->num_args &&
97+
if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args &&
9898
(call_info->num_args == 2 || call_info->num_args == 3)) {
9999

100100
uint32_t t1 = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[0].opline);
@@ -130,7 +130,7 @@ static uint32_t zend_range_info(const zend_call_info *call_info, const zend_ssa
130130

131131
static uint32_t zend_is_type_info(const zend_call_info *call_info, const zend_ssa *ssa)
132132
{
133-
if (call_info->caller_init_opline->extended_value == call_info->num_args &&
133+
if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args &&
134134
call_info->num_args == 1) {
135135
return MAY_BE_RC1 | MAY_BE_FALSE | MAY_BE_TRUE | FUNC_MAY_INLINE;
136136
} else {
@@ -140,7 +140,7 @@ static uint32_t zend_is_type_info(const zend_call_info *call_info, const zend_ss
140140

141141
static uint32_t zend_l_ss_info(const zend_call_info *call_info, const zend_ssa *ssa)
142142
{
143-
if (call_info->caller_init_opline->extended_value == call_info->num_args &&
143+
if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args &&
144144
call_info->num_args == 2) {
145145

146146
uint32_t arg1_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[0].opline);
@@ -165,7 +165,7 @@ static uint32_t zend_l_ss_info(const zend_call_info *call_info, const zend_ssa *
165165

166166
static uint32_t zend_lb_ssn_info(const zend_call_info *call_info, const zend_ssa *ssa)
167167
{
168-
if (call_info->caller_init_opline->extended_value == call_info->num_args &&
168+
if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args &&
169169
call_info->num_args == 3) {
170170
uint32_t arg1_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[0].opline);
171171
uint32_t arg2_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[1].opline);
@@ -192,7 +192,7 @@ static uint32_t zend_lb_ssn_info(const zend_call_info *call_info, const zend_ssa
192192

193193
static uint32_t zend_b_s_info(const zend_call_info *call_info, const zend_ssa *ssa)
194194
{
195-
if (call_info->caller_init_opline->extended_value == call_info->num_args &&
195+
if (call_info->caller_init_opline->extended_value == (uint32_t)call_info->num_args &&
196196
call_info->num_args == 1) {
197197

198198
uint32_t arg1_info = _ssa_op1_info(call_info->caller_op_array, ssa, call_info->arg_info[0].opline);
@@ -1251,7 +1251,7 @@ uint32_t zend_get_func_info(const zend_call_info *call_info, const zend_ssa *ssa
12511251
int zend_func_info_startup(void)
12521252
{
12531253
zend_extension dummy;
1254-
int i;
1254+
size_t i;
12551255

12561256
if (zend_func_info_rid == -1) {
12571257
zend_func_info_rid = zend_get_resource_handle(&dummy);

‎ext/opcache/Optimizer/zend_inference.c

+3-5
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
if (ssa->ops[line-1].result_def >= 0) { \
8686
MACRO(ssa->ops[line-1].result_def); \
8787
} \
88-
} else if (line+1 < op_array->last && \
88+
} else if ((uint32_t)line+1 < op_array->last && \
8989
op_array->opcodes[line+1].opcode == ZEND_OP_DATA) { \
9090
if (ssa->ops[line+1].op1_def >= 0) { \
9191
MACRO(ssa->ops[line+1].op1_def); \
@@ -3437,8 +3437,7 @@ int zend_infer_types_ex(const zend_op_array *op_array, const zend_script *script
34373437
zend_ssa_var *ssa_vars = ssa->vars;
34383438
zend_ssa_var_info *ssa_var_info = ssa->var_info;
34393439
int ssa_vars_count = ssa->vars_count;
3440-
uint i;
3441-
int j;
3440+
int i, j;
34423441
uint32_t tmp;
34433442

34443443
while (!zend_bitset_empty(worklist, zend_bitset_len(ssa_vars_count))) {
@@ -3674,8 +3673,7 @@ static int zend_type_narrowing(const zend_op_array *op_array, const zend_script
36743673
ALLOCA_FLAG(use_heap);
36753674
zend_bitset visited = ZEND_BITSET_ALLOCA(2 * bitset_len, use_heap);
36763675
zend_bitset worklist = visited + bitset_len;
3677-
int i;
3678-
uint32_t v;
3676+
int i, v;
36793677
zend_op *opline;
36803678
zend_bool narrowed = 0;
36813679

‎ext/opcache/ZendAccelerator.c

+6-11
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,7 @@ static void zend_accel_init_auto_globals(void)
14271427
}
14281428
}
14291429

1430-
static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handle, int type, char *key, unsigned int key_length, zend_op_array **op_array_p)
1430+
static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handle, int type, char *key, zend_op_array **op_array_p)
14311431
{
14321432
zend_persistent_script *new_persistent_script;
14331433
zend_op_array *orig_active_op_array;
@@ -1440,12 +1440,7 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handl
14401440

14411441
/* Try to open file */
14421442
if (file_handle->type == ZEND_HANDLE_FILENAME) {
1443-
if (accelerator_orig_zend_stream_open_function(file_handle->filename, file_handle) == SUCCESS) {
1444-
/* key may be changed by zend_stream_open_function() */
1445-
if (key == ZCG(key)) {
1446-
key_length = ZCG(key_len);
1447-
}
1448-
} else {
1443+
if (accelerator_orig_zend_stream_open_function(file_handle->filename, file_handle) != SUCCESS) {
14491444
*op_array_p = NULL;
14501445
if (type == ZEND_REQUIRE) {
14511446
zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename);
@@ -1484,7 +1479,7 @@ static zend_persistent_script *opcache_compile_file(zend_file_handle *file_handl
14841479

14851480
/* check if file is too new (may be it's not written completely yet) */
14861481
if (ZCG(accel_directives).file_update_protection &&
1487-
(ZCG(request_time) - ZCG(accel_directives).file_update_protection < timestamp)) {
1482+
((accel_time_t)(ZCG(request_time) - ZCG(accel_directives).file_update_protection) < timestamp)) {
14881483
*op_array_p = accelerator_orig_compile_file(file_handle, type);
14891484
return NULL;
14901485
}
@@ -1637,7 +1632,7 @@ zend_op_array *file_cache_compile_file(zend_file_handle *file_handle, int type)
16371632
return zend_accel_load_script(persistent_script, 1);
16381633
}
16391634

1640-
persistent_script = opcache_compile_file(file_handle, type, NULL, 0, &op_array);
1635+
persistent_script = opcache_compile_file(file_handle, type, NULL, &op_array);
16411636

16421637
if (persistent_script) {
16431638
from_memory = 0;
@@ -1834,7 +1829,7 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
18341829
* If it isn't compile_and_cache_file() changes the flag to 0
18351830
*/
18361831
from_shared_memory = 0;
1837-
persistent_script = opcache_compile_file(file_handle, type, key, key ? key_length : 0, &op_array);
1832+
persistent_script = opcache_compile_file(file_handle, type, key, &op_array);
18381833
if (persistent_script) {
18391834
persistent_script = cache_script_in_shared_memory(persistent_script, key, key ? key_length : 0, &from_shared_memory);
18401835
}
@@ -2060,7 +2055,7 @@ static void accel_activate(void)
20602055
ZCG(include_path_check) = 1;
20612056

20622057
/* check if ZCG(function_table) wasn't somehow polluted on the way */
2063-
if (ZCG(internal_functions_count) != zend_hash_num_elements(&ZCG(function_table))) {
2058+
if (ZCG(internal_functions_count) != (zend_long)zend_hash_num_elements(&ZCG(function_table))) {
20642059
zend_accel_error(ACCEL_LOG_WARNING, "Internal functions count changed - was %d, now %d", ZCG(internal_functions_count), zend_hash_num_elements(&ZCG(function_table)));
20652060
}
20662061

‎ext/opcache/zend_accelerator_module.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ static zend_function_entry accel_functions[] = {
8080
/* Private functions */
8181
ZEND_FE(opcache_get_configuration, arginfo_opcache_none)
8282
ZEND_FE(opcache_get_status, arginfo_opcache_get_status)
83-
{ NULL, NULL, NULL, 0, 0 }
83+
ZEND_FE_END
8484
};
8585

8686
static int validate_api_restriction(void)
8787
{
8888
if (ZCG(accel_directives).restrict_api && *ZCG(accel_directives).restrict_api) {
89-
int len = strlen(ZCG(accel_directives).restrict_api);
89+
size_t len = strlen(ZCG(accel_directives).restrict_api);
9090

9191
if (!SG(request_info).path_translated ||
9292
strlen(SG(request_info).path_translated) < len ||

‎ext/opcache/zend_persist.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,21 @@ static void zend_hash_persist(HashTable *ht, zend_persist_func_t pPersistElement
8989
void *data = HT_GET_DATA_ADDR(ht);
9090
zend_accel_store(data, HT_USED_SIZE(ht));
9191
HT_SET_DATA_ADDR(ht, data);
92-
} else if (ht->nNumUsed < -(int32_t)ht->nTableMask / 2) {
92+
} else if (ht->nNumUsed < (uint32_t)(-(int32_t)ht->nTableMask) / 2) {
9393
/* compact table */
9494
void *old_data = HT_GET_DATA_ADDR(ht);
9595
Bucket *old_buckets = ht->arData;
96-
int32_t hash_size;
96+
uint32_t hash_size;
9797

9898
if (ht->nNumUsed <= HT_MIN_SIZE) {
9999
hash_size = HT_MIN_SIZE;
100100
} else {
101-
hash_size = -(int32_t)ht->nTableMask;
101+
hash_size = (uint32_t)(-(int32_t)ht->nTableMask);
102102
while (hash_size >> 1 > ht->nNumUsed) {
103103
hash_size >>= 1;
104104
}
105105
}
106-
ht->nTableMask = -hash_size;
106+
ht->nTableMask = (uint32_t)(-(int32_t)hash_size);
107107
ZEND_ASSERT(((zend_uintptr_t)ZCG(mem) & 0x7) == 0); /* should be 8 byte aligned */
108108
HT_SET_DATA_ADDR(ht, ZCG(mem));
109109
ZCG(mem) = (void*)((char*)ZCG(mem) + ZEND_ALIGNED_SIZE((hash_size * sizeof(uint32_t)) + (ht->nNumUsed * sizeof(Bucket))));
@@ -171,21 +171,21 @@ static void zend_hash_persist_immutable(HashTable *ht)
171171
}
172172
if (ht->u.flags & HASH_FLAG_PACKED) {
173173
HT_SET_DATA_ADDR(ht, zend_accel_memdup(HT_GET_DATA_ADDR(ht), HT_USED_SIZE(ht)));
174-
} else if (ht->nNumUsed < -(int32_t)ht->nTableMask / 2) {
174+
} else if (ht->nNumUsed < (uint32_t)(-(int32_t)ht->nTableMask) / 2) {
175175
/* compact table */
176176
void *old_data = HT_GET_DATA_ADDR(ht);
177177
Bucket *old_buckets = ht->arData;
178-
int32_t hash_size;
178+
uint32_t hash_size;
179179

180180
if (ht->nNumUsed <= HT_MIN_SIZE) {
181181
hash_size = HT_MIN_SIZE;
182182
} else {
183-
hash_size = -(int32_t)ht->nTableMask;
183+
hash_size = (uint32_t)(-(int32_t)ht->nTableMask);
184184
while (hash_size >> 1 > ht->nNumUsed) {
185185
hash_size >>= 1;
186186
}
187187
}
188-
ht->nTableMask = -hash_size;
188+
ht->nTableMask = (uint32_t)(-(int32_t)hash_size);
189189
ZEND_ASSERT(((zend_uintptr_t)ZCG(mem) & 0x7) == 0); /* should be 8 byte aligned */
190190
HT_SET_DATA_ADDR(ht, ZCG(mem));
191191
ZCG(mem) = (void*)((char*)ZCG(mem) + (hash_size * sizeof(uint32_t)) + (ht->nNumUsed * sizeof(Bucket)));

‎ext/opcache/zend_persist_calc.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ static void zend_hash_persist_calc(HashTable *ht, void (*pPersistElement)(zval *
6060
return;
6161
}
6262

63-
if (!(ht->u.flags & HASH_FLAG_PACKED) && ht->nNumUsed < -(int32_t)ht->nTableMask / 2) {
63+
if (!(ht->u.flags & HASH_FLAG_PACKED) && ht->nNumUsed < (uint32_t)(-(int32_t)ht->nTableMask) / 2) {
6464
/* compact table */
65-
int32_t hash_size;
65+
uint32_t hash_size;
6666

6767
if (ht->nNumUsed <= HT_MIN_SIZE) {
6868
hash_size = HT_MIN_SIZE;
6969
} else {
70-
hash_size = -(int32_t)ht->nTableMask;
70+
hash_size = (uint32_t)(-(int32_t)ht->nTableMask);
7171
while (hash_size >> 1 > ht->nNumUsed) {
7272
hash_size >>= 1;
7373
}

‎main/getopt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
8989
}
9090
if ((argv[*optind][0] == '-') && (argv[*optind][1] == '-')) {
9191
const char *pos;
92-
int arg_end = (int)strlen(argv[*optind])-1;
92+
size_t arg_end = strlen(argv[*optind])-1;
9393

9494
/* '--' indicates end of args if not followed by a known long option name */
9595
if (argv[*optind][2] == '\0') {

‎main/rfc1867.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ static int multipart_buffer_read(multipart_buffer *self, char *buf, size_t bytes
620620
char *bound;
621621

622622
/* fill buffer if needed */
623-
if (bytes > self->bytes_in_buffer) {
623+
if (bytes > (size_t)self->bytes_in_buffer) {
624624
fill_buffer(self);
625625
}
626626

@@ -1058,7 +1058,7 @@ SAPI_API SAPI_POST_HANDLER_FUNC(rfc1867_post_handler) /* {{{ */
10581058
wlen = write(fd, buff, blen);
10591059
#endif
10601060

1061-
if (wlen == -1) {
1061+
if (wlen == (size_t)-1) {
10621062
/* write failed */
10631063
#if DEBUG_FILE_UPLOAD
10641064
sapi_module.sapi_error(E_NOTICE, "write() failed - %s", strerror(errno));

0 commit comments

Comments
 (0)