Refactor php_com_do_invoke()

Use zend_string*
Return zend_result
This commit is contained in:
George Peter Banyard 2021-09-26 02:19:34 +01:00
parent 4a8ca7294e
commit f3ca081379
No known key found for this signature in database
GPG key ID: D49A095D7329F6DC
4 changed files with 12 additions and 12 deletions

View file

@ -111,8 +111,8 @@ static zval *saproxy_read_dimension(zend_object *object, zval *offset, int type,
}
VariantInit(&v);
res = php_com_do_invoke(proxy->obj, Z_STRVAL(proxy->indices[0]),
Z_STRLEN(proxy->indices[0]), DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v,
res = php_com_do_invoke(proxy->obj, Z_STR(proxy->indices[0]),
DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v,
proxy->dimensions, args, 0);
efree(args);
@ -228,8 +228,8 @@ static void saproxy_write_dimension(zend_object *object, zval *offset, zval *val
return;
}
VariantInit(&v);
if (SUCCESS == php_com_do_invoke(proxy->obj, Z_STRVAL(proxy->indices[0]),
Z_STRLEN(proxy->indices[0]), DISPATCH_PROPERTYPUT, &v, proxy->dimensions + 1,
if (SUCCESS == php_com_do_invoke(proxy->obj, Z_STR(proxy->indices[0]),
DISPATCH_PROPERTYPUT, &v, proxy->dimensions + 1,
args, 0)) {
VariantClear(&v);
}