Commit: d5979c88eaca273479cf244d3e10c2f089c4f080 Author: Christopher Jones <s...@php.net> Mon, 19 Aug 2013 17:17:54 -0700 Parents: 4ee1ec4bcfee93a3d9bdc2abf195bf5b29dcea73 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d5979c88eaca273479cf244d3e10c2f089c4f080 Log: Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Changed paths: M ext/curl/interface.c M ext/intl/calendar/calendar_methods.cpp M ext/intl/calendar/gregoriancalendar_methods.cpp M ext/intl/msgformat/msgformat_helpers.cpp Diff: diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 8617954..9fdb57c 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2441,7 +2441,7 @@ string_copy: ph = HASH_OF(*zvalue); if (!ph) { - char *name; + char *name = NULL; switch (option) { case CURLOPT_HTTPHEADER: name = "CURLOPT_HTTPHEADER"; diff --git a/ext/intl/calendar/calendar_methods.cpp b/ext/intl/calendar/calendar_methods.cpp index db10502..ae7d009 100644 --- a/ext/intl/calendar/calendar_methods.cpp +++ b/ext/intl/calendar/calendar_methods.cpp @@ -184,7 +184,6 @@ U_CFUNC PHP_FUNCTION(intlcal_get_keyword_values_for_locale) U_CFUNC PHP_FUNCTION(intlcal_get_now) { - UErrorCode status = U_ZERO_ERROR; intl_error_reset(NULL TSRMLS_CC); if (zend_parse_parameters_none() == FAILURE) { diff --git a/ext/intl/calendar/gregoriancalendar_methods.cpp b/ext/intl/calendar/gregoriancalendar_methods.cpp index 3c05253..08b8949 100644 --- a/ext/intl/calendar/gregoriancalendar_methods.cpp +++ b/ext/intl/calendar/gregoriancalendar_methods.cpp @@ -38,7 +38,6 @@ static inline GregorianCalendar *fetch_greg(Calendar_object *co) { static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS) { - zval *object = getThis(); zval **tz_object = NULL; zval **args_a[6] = {0}, ***args = &args_a[0]; @@ -84,7 +83,7 @@ static void _php_intlgregcal_constructor_body(INTERNAL_FUNCTION_PARAMETERS) } // instantion of ICU object - GregorianCalendar *gcal; + GregorianCalendar *gcal = NULL; if (variant <= 2) { // From timezone and locale (0 to 2 arguments) diff --git a/ext/intl/msgformat/msgformat_helpers.cpp b/ext/intl/msgformat/msgformat_helpers.cpp index 9ee1cdc..c4456d5 100644 --- a/ext/intl/msgformat/msgformat_helpers.cpp +++ b/ext/intl/msgformat/msgformat_helpers.cpp @@ -487,7 +487,7 @@ U_CFUNC void umsg_format_helper(MessageFormatter_object *mfo, } case Formattable::kLong: { - int32_t tInt32; + int32_t tInt32 = 0; retry_klong: if (Z_TYPE_PP(elem) == IS_DOUBLE) { if (Z_DVAL_PP(elem) > (double)INT32_MAX || @@ -517,7 +517,7 @@ retry_klong: } case Formattable::kInt64: { - int64_t tInt64; + int64_t tInt64 = 0; retry_kint64: if (Z_TYPE_PP(elem) == IS_DOUBLE) { if (Z_DVAL_PP(elem) > (double)U_INT64_MAX || -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
