From c636f667936983e34ee1fe553efa4607d70a4b39 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Jun 2018 11:12:49 +0200 Subject: add upstream patches for PHP 7.3 --- 90c105136d52d53a06617002209a158091b09686.patch | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 90c105136d52d53a06617002209a158091b09686.patch (limited to '90c105136d52d53a06617002209a158091b09686.patch') diff --git a/90c105136d52d53a06617002209a158091b09686.patch b/90c105136d52d53a06617002209a158091b09686.patch new file mode 100644 index 0000000..52ce9a7 --- /dev/null +++ b/90c105136d52d53a06617002209a158091b09686.patch @@ -0,0 +1,36 @@ +From 90c105136d52d53a06617002209a158091b09686 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 28 Jun 2018 10:51:06 +0200 +Subject: [PATCH] fix -Wformat and -Wint-in-bool-context warnigngs + +--- + provider.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/provider.c b/provider.c +index 41eb3be..16d0eed 100644 +--- a/provider.c ++++ b/provider.c +@@ -864,11 +864,11 @@ SOP_METHOD(setParam) + sop = fetch_sop_object(pthis); + + if (!param_val) { +- RETURN_BOOL(SUCCESS == zend_hash_str_del(sop->custom_params, param_key, param_key_len) ? IS_TRUE : IS_FALSE); ++ RETURN_BOOL(SUCCESS == zend_hash_str_del(sop->custom_params, param_key, param_key_len)); + } else { + Z_TRY_ADDREF_P(param_val); + +- RETURN_BOOL(NULL != zend_hash_str_add(sop->custom_params, param_key, param_key_len, param_val) ? IS_TRUE : IS_FALSE); ++ RETURN_BOOL(NULL != zend_hash_str_add(sop->custom_params, param_key, param_key_len, param_val)); + } + } + /* }}} */ +@@ -1048,7 +1048,7 @@ SOP_METHOD(reportProblem) + default: + http_code = OAUTH_ERR_INTERNAL_ERROR; + out = emalloc(48); +- snprintf(out, 48, "oauth_problem=unknown_problem&code=%d", lcode); ++ snprintf(out, 48, "oauth_problem=unknown_problem&code=%lu", lcode); + out_malloced = 1; + } + -- cgit