diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-14 20:43:25 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-14 20:43:25 -0700 |
| commit | 39612afc72623e89a2bc595c9be4be497568d1be (patch) | |
| tree | ba336742c4b5ad3d4c8933748b91332f7436aa66 /main | |
| parent | 8c61758dc772345636e436e3f69bef7323f8b339 (diff) | |
| parent | 9ad97cd48903ea5454853960f2c14de326e0f624 (diff) | |
| download | php-git-39612afc72623e89a2bc595c9be4be497568d1be.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/dba/libinifile/inifile.c
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_variables.c | 2 | ||||
| -rw-r--r-- | main/rfc1867.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index fd52f311d1..7018eae57b 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -55,7 +55,7 @@ PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zva PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars_array TSRMLS_DC) { char *p = NULL; - char *ip; /* index pointer */ + char *ip = NULL; /* index pointer */ char *index; char *var, *var_orig; int var_len, index_len; diff --git a/main/rfc1867.c b/main/rfc1867.c index ed7ce9c0c1..7c208c368c 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -398,7 +398,7 @@ static int find_boundary(multipart_buffer *self, char *boundary TSRMLS_DC) static int multipart_buffer_headers(multipart_buffer *self, zend_llist *header TSRMLS_DC) { char *line; - mime_header_entry prev_entry, entry; + mime_header_entry prev_entry = {0}, entry; int prev_len, cur_len; /* didn't find boundary, abort */ |