Skip to content

Commit 707da29

Browse files
alcaeusalcaeus
committed
PHPC-1442: Remove empty TSRMLS macros
1 parent b7e4a8e commit 707da29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1431
-1445
lines changed

‎phongo_compat.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/* Our Compatability header */
1818
#include "phongo_compat.h"
1919

20-
void phongo_add_exception_prop(const char* prop, int prop_len, zval* value TSRMLS_DC)
20+
void phongo_add_exception_prop(const char* prop, int prop_len, zval* value)
2121
{
2222
if (EG(exception)) {
2323
zval ex;

‎phongo_compat.h‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -102,41 +102,41 @@
102102
#define ADD_ASSOC_INT64(_zv, _key, _value) add_assoc_long((_zv), (_key), (_value))
103103
#define ZVAL_INT64(_zv, _value) ZVAL_LONG((_zv), (_value))
104104
#elif SIZEOF_ZEND_LONG == 4
105-
#define ADD_INDEX_INT64(_zv, _index, _value) \
106-
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
107-
zval zchild; \
108-
php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
109-
add_index_zval((_zv), (_index), &zchild); \
110-
} else { \
111-
add_index_long((_zv), (_index), (_value)); \
105+
#define ADD_INDEX_INT64(_zv, _index, _value) \
106+
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
107+
zval zchild; \
108+
php_phongo_bson_new_int64(&zchild, (_value)); \
109+
add_index_zval((_zv), (_index), &zchild); \
110+
} else { \
111+
add_index_long((_zv), (_index), (_value)); \
112112
}
113-
#define ADD_NEXT_INDEX_INT64(_zv, _value) \
114-
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
115-
zval zchild; \
116-
php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
117-
add_next_index_zval((_zv), &zchild); \
118-
} else { \
119-
add_next_index_long((_zv), (_value)); \
113+
#define ADD_NEXT_INDEX_INT64(_zv, _value) \
114+
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
115+
zval zchild; \
116+
php_phongo_bson_new_int64(&zchild, (_value)); \
117+
add_next_index_zval((_zv), &zchild); \
118+
} else { \
119+
add_next_index_long((_zv), (_value)); \
120120
}
121-
#define ADD_ASSOC_INT64(_zv, _key, _value) \
122-
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
123-
zval zchild; \
124-
php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
125-
add_assoc_zval((_zv), (_key), &zchild); \
126-
} else { \
127-
add_assoc_long((_zv), (_key), (_value)); \
121+
#define ADD_ASSOC_INT64(_zv, _key, _value) \
122+
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
123+
zval zchild; \
124+
php_phongo_bson_new_int64(&zchild, (_value)); \
125+
add_assoc_zval((_zv), (_key), &zchild); \
126+
} else { \
127+
add_assoc_long((_zv), (_key), (_value)); \
128128
}
129-
#define ZVAL_INT64(_zv, _value) \
130-
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
131-
php_phongo_bson_new_int64((_zv), (_value) TSRMLS_CC); \
132-
} else { \
133-
ZVAL_LONG((_zv), (_value)); \
129+
#define ZVAL_INT64(_zv, _value) \
130+
if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
131+
php_phongo_bson_new_int64((_zv), (_value)); \
132+
} else { \
133+
ZVAL_LONG((_zv), (_value)); \
134134
}
135135
#else /* SIZEOF_ZEND_LONG != 8 && SIZEOF_ZEND_LONG != 4 */
136136
#error Unsupported architecture (integers are neither 32-bit nor 64-bit)
137137
#endif /* SIZEOF_ZEND_LONG */
138138

139-
void phongo_add_exception_prop(const char* prop, int prop_len, zval* value TSRMLS_DC);
139+
void phongo_add_exception_prop(const char* prop, int prop_len, zval* value);
140140
zend_bool php_phongo_zend_hash_apply_protection_begin(HashTable* ht);
141141
zend_bool php_phongo_zend_hash_apply_protection_end(HashTable* ht);
142142

‎php_bson.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,19 @@ typedef struct {
9494
s.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY; \
9595
} while (0)
9696

97-
void php_phongo_zval_to_bson(zval* data, php_phongo_bson_flags_t flags, bson_t* bson, bson_t** bson_out TSRMLS_DC);
97+
void php_phongo_zval_to_bson(zval* data, php_phongo_bson_flags_t flags, bson_t* bson, bson_t** bson_out);
9898
bool php_phongo_bson_to_zval_ex(const unsigned char* data, int data_len, php_phongo_bson_state* state);
9999
bool php_phongo_bson_to_zval(const unsigned char* data, int data_len, zval* out);
100100
bool php_phongo_bson_value_to_zval(const bson_value_t* value, zval* zv);
101-
void php_phongo_zval_to_bson_value(zval* data, php_phongo_bson_flags_t flags, bson_value_t* value TSRMLS_DC);
102-
bool php_phongo_bson_typemap_to_state(zval* typemap, php_phongo_bson_typemap* map TSRMLS_DC);
101+
void php_phongo_zval_to_bson_value(zval* data, php_phongo_bson_flags_t flags, bson_value_t* value);
102+
bool php_phongo_bson_typemap_to_state(zval* typemap, php_phongo_bson_typemap* map);
103103
void php_phongo_bson_state_ctor(php_phongo_bson_state* state);
104104
void php_phongo_bson_state_dtor(php_phongo_bson_state* state);
105105
void php_phongo_bson_state_copy_ctor(php_phongo_bson_state* dst, php_phongo_bson_state* src);
106106
void php_phongo_bson_typemap_dtor(php_phongo_bson_typemap* map);
107107

108-
void php_phongo_bson_new_timestamp_from_increment_and_timestamp(zval* object, uint32_t increment, uint32_t timestamp TSRMLS_DC);
109-
void php_phongo_bson_new_int64(zval* object, int64_t integer TSRMLS_DC);
108+
void php_phongo_bson_new_timestamp_from_increment_and_timestamp(zval* object, uint32_t increment, uint32_t timestamp);
109+
void php_phongo_bson_new_int64(zval* object, int64_t integer);
110110

111111
php_phongo_field_path* php_phongo_field_path_alloc(bool owns_elements);
112112
void php_phongo_field_path_free(php_phongo_field_path* field_path);

0 commit comments

Comments
 (0)