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 /ext/intl | |
| 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 'ext/intl')
| -rw-r--r-- | ext/intl/grapheme/grapheme_util.c | 2 | ||||
| -rw-r--r-- | ext/intl/resourcebundle/resourcebundle_class.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/intl/grapheme/grapheme_util.c b/ext/intl/grapheme/grapheme_util.c index 883fa0391a..c752b02372 100644 --- a/ext/intl/grapheme/grapheme_util.c +++ b/ext/intl/grapheme/grapheme_util.c @@ -130,7 +130,7 @@ void grapheme_substr_ascii(char *str, int str_len, int f, int l, int argc, char /* {{{ grapheme_strpos_utf16 - strrpos using utf16*/ int grapheme_strpos_utf16(unsigned char *haystack, int32_t haystack_len, unsigned char*needle, int32_t needle_len, int32_t offset, int32_t *puchar_pos, int f_ignore_case, int last TSRMLS_DC) { - UChar *uhaystack = NULL, *puhaystack, *uneedle = NULL; + UChar *uhaystack = NULL, *uneedle = NULL; int32_t uhaystack_len = 0, uneedle_len = 0, char_pos, ret_pos, offset_pos = 0; unsigned char u_break_iterator_buffer[U_BRK_SAFECLONE_BUFFERSIZE]; UBreakIterator* bi = NULL; diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index db46bf5b16..9c369bdecc 100644 --- a/ext/intl/resourcebundle/resourcebundle_class.c +++ b/ext/intl/resourcebundle/resourcebundle_class.c @@ -161,8 +161,8 @@ PHP_FUNCTION( resourcebundle_create ) /* {{{ resourcebundle_array_fetch */ static void resourcebundle_array_fetch(zval *object, zval *offset, zval *return_value, int fallback TSRMLS_DC) { - int32_t meindex; - char * mekey; + int32_t meindex = 0; + char * mekey = NULL; long mekeylen; zend_bool is_numeric = 0; char *pbuf; |