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

- Warning fixes by Steph

Browse source
This commit is contained in:
Marcus Boerger 2006-02-26 10:57:00 +00:00
parent 84fc80064b
commit 5a69b29082
17 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_execute.c
View file

@ -177,8 +177,8 @@ static inline zval *_get_zval_ptr_var(znode *node, temp_variable *Ts, zend_free_
should_free->var = ptr; should_free->var = ptr;
if (T->str_offset.str->type != IS_STRING if (T->str_offset.str->type != IS_STRING
|| ((int)T->str_offset.offset<0) || ((int)T->str_offset.offset < 0)
|| (T->str_offset.str->value.str.len <= T->str_offset.offset)) { || (T->str_offset.str->value.str.len <= (int)T->str_offset.offset)) {
zend_error(E_NOTICE, "Uninitialized string offset: %d", T->str_offset.offset); zend_error(E_NOTICE, "Uninitialized string offset: %d", T->str_offset.offset);
ptr->value.str.val = STR_EMPTY_ALLOC(); ptr->value.str.val = STR_EMPTY_ALLOC();
ptr->value.str.len = 0; ptr->value.str.len = 0;
@ -658,7 +658,7 @@ static inline void zend_assign_to_variable(znode *result, znode *op1, znode *op2
zend_error(E_WARNING, "Illegal string offset: %d", T->str_offset.offset); zend_error(E_WARNING, "Illegal string offset: %d", T->str_offset.offset);
break; break;
} }
if (T->str_offset.offset >= T->str_offset.str->value.str.len) { if ((int)T->str_offset.offset >= T->str_offset.str->value.str.len) {
zend_uint i; zend_uint i;
if (T->str_offset.str->value.str.len==0) { if (T->str_offset.str->value.str.len==0) {

2
Zend/zend_execute_API.c
View file

@ -482,7 +482,7 @@ ZEND_API int zval_update_constant(zval **pp, void *arg TSRMLS_DC)
continue; continue;
} }
if (const_value.type == IS_STRING && const_value.value.str.len == str_index_len-1 && if (const_value.type == IS_STRING && const_value.value.str.len == (int)str_index_len-1 &&
!strncmp(const_value.value.str.val, str_index, str_index_len)) { !strncmp(const_value.value.str.val, str_index, str_index_len)) {
/* constant value is the same as its name */ /* constant value is the same as its name */
zval_dtor(&const_value); zval_dtor(&const_value);

2
Zend/zend_interfaces.c
View file

@ -336,7 +336,7 @@ static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entr
} else if (class_type->get_iterator != zend_user_it_get_new_iterator) { } else if (class_type->get_iterator != zend_user_it_get_new_iterator) {
/* c-level get_iterator cannot be changed (exception being only Traversable is implmented) */ /* c-level get_iterator cannot be changed (exception being only Traversable is implmented) */
if (class_type->num_interfaces) { if (class_type->num_interfaces) {
for (i = 0; i < class_type->num_interfaces; i++) { for (i = 0; i < (int)class_type->num_interfaces; i++) {
if (class_type->interfaces[i] == zend_ce_iterator) { if (class_type->interfaces[i] == zend_ce_iterator) {
return FAILURE; return FAILURE;
} }

2
Zend/zend_vm_def.h
View file

@ -3096,7 +3096,7 @@ ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
HashTable *fe_ht; HashTable *fe_ht;
zend_object_iterator *iter = NULL; zend_object_iterator *iter = NULL;
int key_type; int key_type;
zend_bool use_key = opline->extended_value & ZEND_FE_FETCH_WITH_KEY; zend_bool use_key = (zend_bool)(opline->extended_value & ZEND_FE_FETCH_WITH_KEY);
PZVAL_LOCK(array); PZVAL_LOCK(array);

2
Zend/zend_vm_execute.h
View file

@ -7561,7 +7561,7 @@ static int ZEND_FE_FETCH_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
HashTable *fe_ht; HashTable *fe_ht;
zend_object_iterator *iter = NULL; zend_object_iterator *iter = NULL;
int key_type; int key_type;
zend_bool use_key = opline->extended_value & ZEND_FE_FETCH_WITH_KEY; zend_bool use_key = (zend_bool)(opline->extended_value & ZEND_FE_FETCH_WITH_KEY);
PZVAL_LOCK(array); PZVAL_LOCK(array);

2
ext/ereg/ereg.c
View file

@ -355,7 +355,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
new_l = strlen(buf) + subs[0].rm_so; /* part before the match */ new_l = strlen(buf) + subs[0].rm_so; /* part before the match */
walk = replace; walk = replace;
while (*walk) { while (*walk) {
if ('\\' == *walk && isdigit((unsigned char)walk[1]) && ((unsigned char)walk[1]) - '0' <= re.re_nsub) { if ('\\' == *walk && isdigit((unsigned char)walk[1]) && ((unsigned char)walk[1]) - '0' <= (int)re.re_nsub) {
if (subs[walk[1] - '0'].rm_so > -1 && subs[walk[1] - '0'].rm_eo > -1) { if (subs[walk[1] - '0'].rm_so > -1 && subs[walk[1] - '0'].rm_eo > -1) {
new_l += subs[walk[1] - '0'].rm_eo - subs[walk[1] - '0'].rm_so; new_l += subs[walk[1] - '0'].rm_eo - subs[walk[1] - '0'].rm_so;
} }

16
ext/standard/array.c
View file

@ -1810,14 +1810,14 @@ HashTable* php_splice(HashTable *in_hash, int offset, int length,
/* Clamp the offset.. */ /* Clamp the offset.. */
if (offset > num_in) if (offset > num_in)
offset = num_in; offset = num_in;
else if (offset < 0 && (offset=num_in+offset) < 0) else if (offset < 0 && (offset = (num_in + offset)) < 0)
offset = 0; offset = 0;
/* ..and the length */ /* ..and the length */
if (length < 0) { if (length < 0) {
length = num_in-offset+length; length = num_in - offset + length;
} else if (((unsigned) offset + (unsigned) length) > num_in) { } else if (((unsigned)offset + (unsigned)length) > (unsigned)num_in) {
length = num_in-offset; length = num_in - offset;
} }
/* Create and initialize output hash */ /* Create and initialize output hash */
@ -2204,14 +2204,14 @@ PHP_FUNCTION(array_slice)
/* Clamp the offset.. */ /* Clamp the offset.. */
if (offset_val > num_in) if (offset_val > num_in)
return; return;
else if (offset_val < 0 && (offset_val=num_in+offset_val) < 0) else if (offset_val < 0 && (offset_val = (num_in + offset_val)) < 0)
offset_val = 0; offset_val = 0;
/* ..and the length */ /* ..and the length */
if (length_val < 0) { if (length_val < 0) {
length_val = num_in-offset_val+length_val; length_val = num_in - offset_val + length_val;
} else if (((unsigned) offset_val + (unsigned) length_val) > num_in) { } else if (((unsigned)offset_val + (unsigned)length_val) > (unsigned)num_in) {
length_val = num_in-offset_val; length_val = num_in - offset_val;
} }
if (length_val == 0) if (length_val == 0)

2
ext/standard/dir.c
View file

@ -370,7 +370,7 @@ PHP_FUNCTION(glob)
int pattern_len; int pattern_len;
long flags = 0; long flags = 0;
glob_t globbuf; glob_t globbuf;
unsigned int n; int n;
int ret; int ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &pattern, &pattern_len, &flags) == FAILURE) if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &pattern, &pattern_len, &flags) == FAILURE)

4
ext/standard/exec.c
View file

@ -135,7 +135,7 @@ int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC)
/* strip trailing whitespaces */ /* strip trailing whitespaces */
l = bufl; l = bufl;
while (l-- && isspace(((unsigned char *)buf)[l])); while (l-- && isspace(((unsigned char *)buf)[l]));
if (l != (bufl - 1)) { if (l != (int)(bufl - 1)) {
bufl = l + 1; bufl = l + 1;
buf[bufl] = '\0'; buf[bufl] = '\0';
} }
@ -148,7 +148,7 @@ int php_exec(int type, char *cmd, zval *array, zval *return_value TSRMLS_DC)
if (type != 2) { if (type != 2) {
l = bufl; l = bufl;
while (l-- && isspace(((unsigned char *)buf)[l])); while (l-- && isspace(((unsigned char *)buf)[l]));
if (l != (bufl - 1)) { if (l != (int)(bufl - 1)) {
bufl = l + 1; bufl = l + 1;
buf[bufl] = '\0'; buf[bufl] = '\0';
} }

2
ext/standard/pack.c
View file

@ -55,7 +55,7 @@
#endif #endif
#define INC_OUTPUTPOS(a,b) \ #define INC_OUTPUTPOS(a,b) \
if ((a) < 0 || ((INT_MAX - outputpos)/(b)) < (a)) { \ if ((a) < 0 || ((INT_MAX - outputpos)/((int)b)) < (a)) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Type %c: integer overflow in format string", code); \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Type %c: integer overflow in format string", code); \
RETURN_FALSE; \ RETURN_FALSE; \
} \ } \

2
ext/standard/reg.c
View file

@ -355,7 +355,7 @@ PHPAPI char *php_reg_replace(const char *pattern, const char *replace, const cha
new_l = strlen(buf) + subs[0].rm_so; /* part before the match */ new_l = strlen(buf) + subs[0].rm_so; /* part before the match */
walk = replace; walk = replace;
while (*walk) { while (*walk) {
if ('\\' == *walk && isdigit((unsigned char)walk[1]) && ((unsigned char)walk[1]) - '0' <= re.re_nsub) { if ('\\' == *walk && isdigit((unsigned char)walk[1]) && ((unsigned char)walk[1]) - '0' <= (int)re.re_nsub) {
if (subs[walk[1] - '0'].rm_so > -1 && subs[walk[1] - '0'].rm_eo > -1) { if (subs[walk[1] - '0'].rm_so > -1 && subs[walk[1] - '0'].rm_eo > -1) {
new_l += subs[walk[1] - '0'].rm_eo - subs[walk[1] - '0'].rm_so; new_l += subs[walk[1] - '0'].rm_eo - subs[walk[1] - '0'].rm_so;
} }

10
ext/standard/string.c
View file

@ -237,7 +237,7 @@ static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior)
} }
} }
if (((unsigned) start + (unsigned) len) > len1) { if ((start + len) > len1) {
len = len1 - start; len = len1 - start;
} }
@ -1166,7 +1166,7 @@ quit_loop:
if (state == 1) { if (state == 1) {
cend = c; cend = c;
} }
if (suffix != NULL && sufflen < (cend - comp) && if (suffix != NULL && sufflen < (uint)(cend - comp) &&
memcmp(cend - sufflen, suffix, sufflen) == 0) { memcmp(cend - sufflen, suffix, sufflen) == 0) {
cend -= sufflen; cend -= sufflen;
} }
@ -1983,7 +1983,7 @@ PHP_FUNCTION(substr)
RETURN_FALSE; RETURN_FALSE;
} }
if (((unsigned) f + (unsigned) l) > Z_STRLEN_PP(str)) { if ((f + l) > Z_STRLEN_PP(str)) {
l = Z_STRLEN_PP(str) - f; l = Z_STRLEN_PP(str) - f;
} }
@ -2080,7 +2080,7 @@ PHP_FUNCTION(substr_replace)
} }
} }
if (((unsigned) f + (unsigned) l) > Z_STRLEN_PP(str)) { if ((f + l) > Z_STRLEN_PP(str)) {
l = Z_STRLEN_PP(str) - f; l = Z_STRLEN_PP(str) - f;
} }
if (Z_TYPE_PP(repl) == IS_ARRAY) { if (Z_TYPE_PP(repl) == IS_ARRAY) {
@ -2176,7 +2176,7 @@ PHP_FUNCTION(substr_replace)
} }
} }
if (((unsigned) f + (unsigned) l) > Z_STRLEN_PP(tmp_str)) { if ((f + l) > Z_STRLEN_PP(tmp_str)) {
l = Z_STRLEN_PP(tmp_str) - f; l = Z_STRLEN_PP(tmp_str) - f;
} }

2
ext/standard/user_filters.c
View file

@ -406,7 +406,7 @@ static void php_stream_bucket_attach(int append, INTERNAL_FUNCTION_PARAMETERS)
if (!bucket->own_buf) { if (!bucket->own_buf) {
bucket = php_stream_bucket_make_writeable(bucket TSRMLS_CC); bucket = php_stream_bucket_make_writeable(bucket TSRMLS_CC);
} }
if (bucket->buflen != Z_STRLEN_PP(pzdata)) { if ((int)bucket->buflen != Z_STRLEN_PP(pzdata)) {
bucket->buf = perealloc(bucket->buf, Z_STRLEN_PP(pzdata), bucket->is_persistent); bucket->buf = perealloc(bucket->buf, Z_STRLEN_PP(pzdata), bucket->is_persistent);
bucket->buflen = Z_STRLEN_PP(pzdata); bucket->buflen = Z_STRLEN_PP(pzdata);
} }

2
main/main.c
View file

@ -659,7 +659,7 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
* be NULL if PG(last_error_message) is not NULL */ * be NULL if PG(last_error_message) is not NULL */
if (strcmp(PG(last_error_message), buffer) if (strcmp(PG(last_error_message), buffer)
|| (!PG(ignore_repeated_source) || (!PG(ignore_repeated_source)
&& ((PG(last_error_lineno) != error_lineno) && ((PG(last_error_lineno) != (int)error_lineno)
|| strcmp(PG(last_error_file), error_filename)))) { || strcmp(PG(last_error_file), error_filename)))) {
display = 1; display = 1;
} else { } else {

2
main/streams/filter.c
View file

@ -351,7 +351,7 @@ PHPAPI void _php_stream_filter_append(php_stream_filter_chain *chain, php_stream
php_stream_bucket_append(brig_inp, bucket TSRMLS_CC); php_stream_bucket_append(brig_inp, bucket TSRMLS_CC);
status = filter->fops->filter(stream, filter, brig_inp, brig_outp, &consumed, PSFS_FLAG_NORMAL TSRMLS_CC); status = filter->fops->filter(stream, filter, brig_inp, brig_outp, &consumed, PSFS_FLAG_NORMAL TSRMLS_CC);
if (stream->readpos + consumed > stream->writepos || consumed < 0) { if (stream->readpos + consumed > (uint)stream->writepos || consumed < 0) {
/* No behaving filter should cause this. */ /* No behaving filter should cause this. */
status = PSFS_ERR_FATAL; status = PSFS_ERR_FATAL;
} }

2
sapi/cgi/fastcgi.c
View file

@ -531,7 +531,7 @@ static int fcgi_read_request(fcgi_request *req)
} }
len = p - buf - sizeof(fcgi_header); len = p - buf - sizeof(fcgi_header);
len += fcgi_make_header((fcgi_header*)buf, FCGI_GET_VALUES_RESULT, 0, len); len += fcgi_make_header((fcgi_header*)buf, FCGI_GET_VALUES_RESULT, 0, len);
if (safe_write(req, buf, sizeof(fcgi_header)+len) != sizeof(fcgi_header)+len) { if (safe_write(req, buf, sizeof(fcgi_header)+len) != (int)sizeof(fcgi_header)+len) {
return 0; return 0;
} }
return 0; return 0;

12
win32/select.c
View file

@ -67,13 +67,13 @@ PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, stru
if ((DWORD)handles[n_handles] == 0xffffffff) { if ((DWORD)handles[n_handles] == 0xffffffff) {
/* socket */ /* socket */
if (SAFE_FD_ISSET(i, rfds)) { if (SAFE_FD_ISSET(i, rfds)) {
FD_SET(i, &sock_read); FD_SET((uint)i, &sock_read);
} }
if (SAFE_FD_ISSET(i, wfds)) { if (SAFE_FD_ISSET(i, wfds)) {
FD_SET(i, &sock_write); FD_SET((uint)i, &sock_write);
} }
if (SAFE_FD_ISSET(i, efds)) { if (SAFE_FD_ISSET(i, efds)) {
FD_SET(i, &sock_except); FD_SET((uint)i, &sock_except);
} }
if (i > sock_max_fd) { if (i > sock_max_fd) {
sock_max_fd = i; sock_max_fd = i;
@ -136,13 +136,13 @@ PHPAPI int php_select(int max_fd, fd_set *rfds, fd_set *wfds, fd_set *efds, stru
for (i = 0; i < n_handles; i++) { for (i = 0; i < n_handles; i++) {
if (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) { if (WAIT_OBJECT_0 == WaitForSingleObject(handles[i], 0)) {
if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) { if (SAFE_FD_ISSET(handle_slot_to_fd[i], rfds)) {
FD_SET(handle_slot_to_fd[i], &aread); FD_SET((uint)handle_slot_to_fd[i], &aread);
} }
if (SAFE_FD_ISSET(handle_slot_to_fd[i], wfds)) { if (SAFE_FD_ISSET(handle_slot_to_fd[i], wfds)) {
FD_SET(handle_slot_to_fd[i], &awrite); FD_SET((uint)handle_slot_to_fd[i], &awrite);
} }
if (SAFE_FD_ISSET(handle_slot_to_fd[i], efds)) { if (SAFE_FD_ISSET(handle_slot_to_fd[i], efds)) {
FD_SET(handle_slot_to_fd[i], &aexcept); FD_SET((uint)handle_slot_to_fd[i], &aexcept);
} }
retcode++; retcode++;
} }