archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed compilation warnings

Browse source
This commit is contained in:
Dmitry Stogov 2014-07-15 15:51:40 +04:00
parent b4c2bd2277
commit 8217e20ddb
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_arena.h
View file

@ -59,11 +59,11 @@ static zend_always_inline void* zend_arena_alloc(zend_arena **arena_ptr, size_t
size = ZEND_MM_ALIGNED_SIZE(size);
if (EXPECTED(size <= (arena->end - ptr))) {
if (EXPECTED(size <= (size_t)(arena->end - ptr))) {
arena->ptr = ptr + size;
} else {
size_t arena_size =
UNEXPECTED((size + ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))) > (arena->end - (char*) arena)) ?
UNEXPECTED((size + ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))) > (size_t)(arena->end - (char*) arena)) ?
(size + ZEND_MM_ALIGNED_SIZE(sizeof(zend_arena))) :
(arena->end - (char*) arena);
zend_arena *new_arena = (zend_arena*)emalloc(arena_size);

4
Zend/zend_execute.h
View file

@ -167,8 +167,8 @@ struct _zend_vm_stack {
#define ZEND_VM_STACK_GROW_IF_NEEDED(count) \
do { \
if (UNEXPECTED(((count) * ZEND_MM_ALIGNED_SIZE(sizeof(zval))) > \
((char*)EG(argument_stack)->end) - \
((char*)EG(argument_stack)->top))) { \
(size_t)(((char*)EG(argument_stack)->end) - \
((char*)EG(argument_stack)->top)))) { \
zend_vm_stack_extend((count) TSRMLS_CC); \
} \
} while (0)

4
Zend/zend_string.h
View file

@ -194,14 +194,14 @@ static zend_always_inline zend_string *zend_str_safe_realloc(zend_string *s, siz
if (IS_INTERNED(s)) {
ret = STR_SAFE_ALLOC(n, m, l, persistent);
memcpy(ret->val, s->val, ((n * m) + l > s->len ? s->len : ((n * m) + l)) + 1);
memcpy(ret->val, s->val, ((n * m) + l > (size_t)s->len ? (size_t)s->len : ((n * m) + l)) + 1);
} else if (STR_REFCOUNT(s) == 1) {
ret = (zend_string *)safe_perealloc(s, n, m, ZEND_MM_ALIGNED_SIZE(_STR_HEADER_SIZE + l + 1), persistent);
ret->len = (n * m) + l;
STR_FORGET_HASH_VAL(ret);
} else {
ret = STR_SAFE_ALLOC(n, m, l, persistent);
memcpy(ret->val, s->val, ((n * m) + l > s->len ? s->len : ((n * m) + l)) + 1);
memcpy(ret->val, s->val, ((n * m) + l > (size_t)s->len ? (size_t)s->len : ((n * m) + l)) + 1);
STR_DELREF(s);
}
return ret;

2
ext/standard/php_smart_str.h
View file

@ -132,7 +132,7 @@
static inline char *smart_str_print_long(char *buf, long num) {
char *r;
_zend_print_signed_to_buf(buf, num, unsigned long, r);
_zend_print_signed_to_buf(buf, num, long, r);
return r;
}