PHPC-1442: Remove empty TSRMLS macros

mongodb · Feb 11, 2020 · 707da29 · 707da29
1 parent b7e4a8e
commit 707da29
Show file tree

Hide file tree

Showing 64 changed files with 1,431 additions and 1,445 deletions.
diff --git a/phongo_compat.c b/phongo_compat.c
@@ -17,7 +17,7 @@
 /* Our Compatability header */
 #include "phongo_compat.h"
 
-void phongo_add_exception_prop(const char* prop, int prop_len, zval* value TSRMLS_DC)
+void phongo_add_exception_prop(const char* prop, int prop_len, zval* value)
 {
 	if (EG(exception)) {
 		zval ex;

diff --git a/phongo_compat.h b/phongo_compat.h
@@ -102,41 +102,41 @@
 #define ADD_ASSOC_INT64(_zv, _key, _value) add_assoc_long((_zv), (_key), (_value))
 #define ZVAL_INT64(_zv, _value) ZVAL_LONG((_zv), (_value))
 #elif SIZEOF_ZEND_LONG == 4
-#define ADD_INDEX_INT64(_zv, _index, _value)                    \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {         \
-		zval zchild;                                            \
-		php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
-		add_index_zval((_zv), (_index), &zchild);               \
-	} else {                                                    \
-		add_index_long((_zv), (_index), (_value));              \
+#define ADD_INDEX_INT64(_zv, _index, _value)            \
+	if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
+		zval zchild;                                    \
+		php_phongo_bson_new_int64(&zchild, (_value));   \
+		add_index_zval((_zv), (_index), &zchild);       \
+	} else {                                            \
+		add_index_long((_zv), (_index), (_value));      \
 	}
-#define ADD_NEXT_INDEX_INT64(_zv, _value)                       \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {         \
-		zval zchild;                                            \
-		php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
-		add_next_index_zval((_zv), &zchild);                    \
-	} else {                                                    \
-		add_next_index_long((_zv), (_value));                   \
+#define ADD_NEXT_INDEX_INT64(_zv, _value)               \
+	if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
+		zval zchild;                                    \
+		php_phongo_bson_new_int64(&zchild, (_value));   \
+		add_next_index_zval((_zv), &zchild);            \
+	} else {                                            \
+		add_next_index_long((_zv), (_value));           \
 	}
-#define ADD_ASSOC_INT64(_zv, _key, _value)                      \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {         \
-		zval zchild;                                            \
-		php_phongo_bson_new_int64(&zchild, (_value) TSRMLS_CC); \
-		add_assoc_zval((_zv), (_key), &zchild);                 \
-	} else {                                                    \
-		add_assoc_long((_zv), (_key), (_value));                \
+#define ADD_ASSOC_INT64(_zv, _key, _value)              \
+	if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
+		zval zchild;                                    \
+		php_phongo_bson_new_int64(&zchild, (_value));   \
+		add_assoc_zval((_zv), (_key), &zchild);         \
+	} else {                                            \
+		add_assoc_long((_zv), (_key), (_value));        \
 	}
-#define ZVAL_INT64(_zv, _value)                               \
-	if ((_value) > INT32_MAX || (_value) < INT32_MIN) {       \
-		php_phongo_bson_new_int64((_zv), (_value) TSRMLS_CC); \
-	} else {                                                  \
-		ZVAL_LONG((_zv), (_value));                           \
+#define ZVAL_INT64(_zv, _value)                         \
+	if ((_value) > INT32_MAX || (_value) < INT32_MIN) { \
+		php_phongo_bson_new_int64((_zv), (_value));     \
+	} else {                                            \
+		ZVAL_LONG((_zv), (_value));                     \
 	}
 #else /* SIZEOF_ZEND_LONG != 8 && SIZEOF_ZEND_LONG != 4 */
 #error Unsupported architecture (integers are neither 32-bit nor 64-bit)
 #endif /* SIZEOF_ZEND_LONG */
 
-void      phongo_add_exception_prop(const char* prop, int prop_len, zval* value TSRMLS_DC);
+void      phongo_add_exception_prop(const char* prop, int prop_len, zval* value);
 zend_bool php_phongo_zend_hash_apply_protection_begin(HashTable* ht);
 zend_bool php_phongo_zend_hash_apply_protection_end(HashTable* ht);
 

diff --git a/php_bson.h b/php_bson.h
@@ -94,19 +94,19 @@ typedef struct {
 		s.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY; \
 	} while (0)
 
-void php_phongo_zval_to_bson(zval* data, php_phongo_bson_flags_t flags, bson_t* bson, bson_t** bson_out TSRMLS_DC);
+void php_phongo_zval_to_bson(zval* data, php_phongo_bson_flags_t flags, bson_t* bson, bson_t** bson_out);
 bool php_phongo_bson_to_zval_ex(const unsigned char* data, int data_len, php_phongo_bson_state* state);
 bool php_phongo_bson_to_zval(const unsigned char* data, int data_len, zval* out);
 bool php_phongo_bson_value_to_zval(const bson_value_t* value, zval* zv);
-void php_phongo_zval_to_bson_value(zval* data, php_phongo_bson_flags_t flags, bson_value_t* value TSRMLS_DC);
-bool php_phongo_bson_typemap_to_state(zval* typemap, php_phongo_bson_typemap* map TSRMLS_DC);
+void php_phongo_zval_to_bson_value(zval* data, php_phongo_bson_flags_t flags, bson_value_t* value);
+bool php_phongo_bson_typemap_to_state(zval* typemap, php_phongo_bson_typemap* map);
 void php_phongo_bson_state_ctor(php_phongo_bson_state* state);
 void php_phongo_bson_state_dtor(php_phongo_bson_state* state);
 void php_phongo_bson_state_copy_ctor(php_phongo_bson_state* dst, php_phongo_bson_state* src);
 void php_phongo_bson_typemap_dtor(php_phongo_bson_typemap* map);
 
-void php_phongo_bson_new_timestamp_from_increment_and_timestamp(zval* object, uint32_t increment, uint32_t timestamp TSRMLS_DC);
-void php_phongo_bson_new_int64(zval* object, int64_t integer TSRMLS_DC);
+void php_phongo_bson_new_timestamp_from_increment_and_timestamp(zval* object, uint32_t increment, uint32_t timestamp);
+void php_phongo_bson_new_int64(zval* object, int64_t integer);
 
 php_phongo_field_path* php_phongo_field_path_alloc(bool owns_elements);
 void                   php_phongo_field_path_free(php_phongo_field_path* field_path);