From fdeb579ae5c58a5da81c866a83d81e76da3347c1 Mon Sep 17 00:00:00 2001 From: maminjie Date: Tue, 1 Dec 2020 12:00:20 +0800 Subject: [PATCH] port to php 8.0.0 --- generator/php.ml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generator/php.ml b/generator/php.ml index e07813f..4046aa8 100644 --- a/generator/php.ml +++ b/generator/php.ml @@ -96,7 +96,7 @@ static int res_guestfs_h; #if ZEND_MODULE_API_NO >= 20151012 # define GUESTFS_RETURN_STRING(x, duplicate) \\ - do { if (duplicate) RETURN_STRING(x) else { RETVAL_STRING(x); efree ((char *)x); return; } } while (0) + do { if (duplicate) { RETURN_STRING(x); } else { RETVAL_STRING(x); efree ((char *)x); return; } } while (0) # define guestfs_add_assoc_string(arg, key, str, dup) \\ add_assoc_string(arg, key, str) # define guestfs_add_assoc_stringl(arg, key, str, len, dup) \\ @@ -177,7 +177,7 @@ static void guestfs_php_handle_dtor (zend_resource *rsrc) #else static void -guestfs_php_handle_dtor (zend_rsrc_list_entry *rsrc TSRMLS_DC) +guestfs_php_handle_dtor (zend_rsrc_list_entry *rsrc) #endif { guestfs_h *g = (guestfs_h *) rsrc->ptr; @@ -247,7 +247,7 @@ PHP_FUNCTION (guestfs_last_error) zval *z_g; guestfs_h *g; - if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, \"r\", + if (zend_parse_parameters (ZEND_NUM_ARGS(), \"r\", &z_g) == FAILURE) { RETURN_FALSE; } @@ -353,7 +353,7 @@ PHP_FUNCTION (guestfs_last_error) ) else param_string in - pr " if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, \"r%s\",\n" + pr " if (zend_parse_parameters (ZEND_NUM_ARGS(), \"r%s\",\n" param_string; pr " &z_g"; List.iter ( -- 2.23.0