From 52a148988ca7f4f37ff2272e817a3207dc6565d8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Feb 2017 18:59:06 +0100 Subject: [PATCH 1/2] Fix build warnings just to make gcc happy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1/ variable « memc_user_data » set but not used [-Wunused-but-set-variable] (void)memc_user_data only to avoid the warning (removed later by optimizer) 2/ « status » may be used uninitialized in this function [-Wmaybe-uninitialized] 3/ pointer targets in passing argument 2 of « smart_str_appendl_ex » differ in signedness [-Wpointer-sign] --- php_memcached.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/php_memcached.c b/php_memcached.c index 19673323..eb5c522b 100644 --- a/php_memcached.c +++ b/php_memcached.c @@ -194,7 +194,8 @@ static inline php_memc_object_t *php_memc_fetch_object(zend_object *obj) { php_error_docref(NULL, E_WARNING, "Memcached constructor was not called"); \ return; \ } \ - memc_user_data = (php_memc_user_data_t *) memcached_get_user_data(intern->memc); + memc_user_data = (php_memc_user_data_t *) memcached_get_user_data(intern->memc); \ + (void)memc_user_data; /* avoid unused variable warning */ static zend_bool s_memc_valid_key_binary(const char *key) @@ -898,7 +899,7 @@ zend_bool s_serialize_value (php_memc_serializer_type serializer, zval *value, s php_error_docref(NULL, E_WARNING, "could not serialize value with igbinary"); return 0; } - smart_str_appendl (buf, buffer, buffer_len); + smart_str_appendl (buf, (char *)buffer, buffer_len); efree(buffer); MEMC_VAL_SET_TYPE(*flags, MEMC_VAL_IS_IGBINARY); } @@ -1058,7 +1059,7 @@ zend_bool s_memc_write_zval (php_memc_object_t *intern, php_memc_write_op op, ze { uint32_t flags = 0; zend_string *payload = NULL; - memcached_return status; + memcached_return status = 0; php_memc_user_data_t *memc_user_data = memcached_get_user_data(intern->memc); zend_long retries = memc_user_data->store_retry_count; From 4d8a384e52014cbd61ec02d3b04fb1c86527847a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Feb 2017 07:43:50 +0100 Subject: [PATCH 2/2] fix -Wunused-const-variable when build with sasl disabled --- php_memcached.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/php_memcached.c b/php_memcached.c index eb5c522b..55d1bdb8 100644 --- a/php_memcached.c +++ b/php_memcached.c @@ -3912,10 +3912,12 @@ ZEND_BEGIN_ARG_INFO(arginfo_getOption, 0) ZEND_ARG_INFO(0, option) ZEND_END_ARG_INFO() +#ifdef HAVE_MEMCACHED_SASL ZEND_BEGIN_ARG_INFO(arginfo_setSaslAuthData, 0) ZEND_ARG_INFO(0, username) ZEND_ARG_INFO(0, password) ZEND_END_ARG_INFO() +#endif ZEND_BEGIN_ARG_INFO(arginfo_setOption, 0) ZEND_ARG_INFO(0, option)