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/date | |
| 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/date')
| -rw-r--r-- | ext/date/php_date.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 013f3910c9..f0c9525e56 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1041,7 +1041,7 @@ char *php_date_short_day_name(timelib_sll y, timelib_sll m, timelib_sll d) static char *date_format(char *format, int format_len, timelib_time *t, int localtime) { smart_str string = {0}; - int i, length; + int i, length = 0; char buffer[97]; timelib_time_offset *offset = NULL; timelib_sll isoweek, isoyear; @@ -2538,8 +2538,8 @@ PHPAPI int php_date_initialize(php_date_obj *dateobj, /*const*/ char *time_str, timelib_time *now; timelib_tzinfo *tzi = NULL; timelib_error_container *err = NULL; - int type = TIMELIB_ZONETYPE_ID, new_dst; - char *new_abbr; + int type = TIMELIB_ZONETYPE_ID, new_dst = 0; + char *new_abbr = NULL; timelib_sll new_offset; if (dateobj->time) { |