Removed obsolete TSRMLS_* usage. (#7731)

pull/7790/head
Joshua Haberman 4 years ago committed by Adam Cozzette
parent 5f32d484c1
commit a28af654fa
  1. 2
      php/ext/google/protobuf/array.c
  2. 24
      php/ext/google/protobuf/def.c
  3. 2
      php/ext/google/protobuf/map.c
  4. 4
      php/ext/google/protobuf/message.c

@ -94,7 +94,7 @@ static void RepeatedField_destructor(zend_object* obj) {
zend_object_std_dtor(&intern->std); zend_object_std_dtor(&intern->std);
} }
static HashTable *RepeatedField_GetProperties(zval *object TSRMLS_DC) { static HashTable *RepeatedField_GetProperties(zval *object) {
return NULL; // We do not have a properties table. return NULL; // We do not have a properties table.
} }

@ -180,8 +180,7 @@ PHP_METHOD(EnumDescriptor, getValue) {
zend_long index; zend_long index;
zval ret; zval ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &index) == if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
FAILURE) {
zend_error(E_USER_ERROR, "Expect integer for index.\n"); zend_error(E_USER_ERROR, "Expect integer for index.\n");
return; return;
} }
@ -284,8 +283,7 @@ PHP_METHOD(OneofDescriptor, getField) {
zend_long index; zend_long index;
zval ret; zval ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &index) == if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
FAILURE) {
zend_error(E_USER_ERROR, "Expect integer for index.\n"); zend_error(E_USER_ERROR, "Expect integer for index.\n");
return; return;
} }
@ -615,8 +613,7 @@ PHP_METHOD(Descriptor, getField) {
zval ret; zval ret;
zend_long index; zend_long index;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &index) == if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
FAILURE) {
zend_error(E_USER_ERROR, "Expect integer for index.\n"); zend_error(E_USER_ERROR, "Expect integer for index.\n");
return; return;
} }
@ -658,8 +655,7 @@ PHP_METHOD(Descriptor, getOneofDecl) {
zend_long index; zend_long index;
zval ret; zval ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &index) == if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
FAILURE) {
zend_error(E_USER_ERROR, "Expect integer for index.\n"); zend_error(E_USER_ERROR, "Expect integer for index.\n");
return; return;
} }
@ -799,8 +795,8 @@ PHP_METHOD(DescriptorPool, getDescriptorByClassName) {
zend_string *str; zend_string *str;
zval ret; zval ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &classname, if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &classname, &classname_len) ==
&classname_len) == FAILURE) { FAILURE) {
return; return;
} }
@ -828,8 +824,8 @@ PHP_METHOD(DescriptorPool, getEnumDescriptorByClassName) {
zend_string *str; zend_string *str;
zval ret; zval ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &classname, if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &classname, &classname_len) ==
&classname_len) == FAILURE) { FAILURE) {
return; return;
} }
@ -856,8 +852,8 @@ PHP_METHOD(DescriptorPool, getDescriptorByProtoName) {
zend_long protoname_len; zend_long protoname_len;
const upb_msgdef *m; const upb_msgdef *m;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &protoname, if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &protoname, &protoname_len) ==
&protoname_len) == FAILURE) { FAILURE) {
return; return;
} }

@ -95,7 +95,7 @@ static zval *Map_GetPropertyPtrPtr(zval *object, zval *member, int type,
return NULL; // We don't offer direct references to our properties. return NULL; // We don't offer direct references to our properties.
} }
static HashTable *map_get_properties(zval *object TSRMLS_DC) { static HashTable *map_get_properties(zval *object) {
return NULL; // We do not have a properties table. return NULL; // We do not have a properties table.
} }

@ -283,7 +283,7 @@ static zval *Message_get_property_ptr_ptr(zval *object, zval *member, int type,
* Object handler for the get_properties event in PHP. This returns a HashTable * Object handler for the get_properties event in PHP. This returns a HashTable
* of our internal properties. We don't support this, so we return NULL. * of our internal properties. We don't support this, so we return NULL.
*/ */
static HashTable* Message_get_properties(zval* object TSRMLS_DC) { static HashTable *Message_get_properties(zval *object) {
return NULL; // We don't offer direct references to our properties. return NULL; // We don't offer direct references to our properties.
} }
@ -619,7 +619,7 @@ PHP_METHOD(Message, serializeToJsonString) {
zend_bool preserve_proto_fieldnames = false; zend_bool preserve_proto_fieldnames = false;
upb_status status; upb_status status;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b",
&preserve_proto_fieldnames) == FAILURE) { &preserve_proto_fieldnames) == FAILURE) {
return; return;
} }

Loading…
Cancel
Save