Fix [-Wformat-extra-args] build warnings

[m6w6/ext-http] / src / php_http_exception.h

diff --git a/src/php_http_exception.h b/src/php_http_exception.h
index 5acf28031a9ad33758f25eacc38b61f8b698c4e1..7638e67488c8e627fae0c133bcce73c6517be14a 100644 (file)
--- a/src/php_http_exception.h
+++ b/src/php_http_exception.h
@@ -15,14 +15,14 @@
 
 /* short hand for zend_throw_exception_ex */
 #define php_http_throw(e, fmt, ...) \
-       zend_throw_exception_ex(php_http_get_exception_ ##e## _class_entry(), 0, fmt, __VA_ARGS__)
+       zend_throw_exception_ex(php_http_get_exception_ ##e## _class_entry(), 0, fmt, ##__VA_ARGS__)
 
 /* wrap a call with replaced zend_error_handling */
 #define php_http_expect(test, e, fail) \
        do { \
                zend_error_handling __zeh; \
                zend_replace_error_handling(EH_THROW, php_http_get_exception_ ##e## _class_entry(), &__zeh); \
-               if (!(test)) { \
+               if (UNEXPECTED(!(test))) { \
                        zend_restore_error_handling(&__zeh); \
                        fail; \
                } \