Cleanup

danog · danog · commit 4d39fafa7b06 · 2025-07-22T14:58:01.000+02:00
diff --git a/php_phongo.h b/php_phongo.h
@@ -78,7 +78,6 @@ zend_object_handlers* phongo_get_std_object_handlers(void);
 	do {                                                    \
 		if (is_temp) {                                      \
 			zend_hash_destroy((props));                     \
-			FREE_HASHTABLE(props);                          \
 		}                                                   \
 	} while (0)
 
diff --git a/src/BSON/Binary.c b/src/BSON/Binary.c
@@ -215,7 +215,6 @@ static void php_phongo_binary_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/DBPointer.c b/src/BSON/DBPointer.c
@@ -178,7 +178,6 @@ static void php_phongo_dbpointer_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/Decimal128.c b/src/BSON/Decimal128.c
@@ -170,7 +170,6 @@ static void php_phongo_decimal128_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/Document.c b/src/BSON/Document.c
@@ -448,7 +448,6 @@ static void php_phongo_document_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/Int64.c b/src/BSON/Int64.c
@@ -177,7 +177,6 @@ static void php_phongo_int64_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/Iterator.c b/src/BSON/Iterator.c
@@ -250,7 +250,6 @@ static void php_phongo_iterator_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 
 	php_phongo_iterator_free_current(intern);
diff --git a/src/BSON/Javascript.c b/src/BSON/Javascript.c
@@ -264,7 +264,6 @@ static void php_phongo_javascript_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/ObjectId.c b/src/BSON/ObjectId.c
@@ -204,7 +204,6 @@ static void php_phongo_objectid_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/PackedArray.c b/src/BSON/PackedArray.c
@@ -432,7 +432,6 @@ static void php_phongo_packedarray_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/Regex.c b/src/BSON/Regex.c
@@ -230,7 +230,6 @@ static void php_phongo_regex_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/Symbol.c b/src/BSON/Symbol.c
@@ -152,7 +152,6 @@ static void php_phongo_symbol_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/Timestamp.c b/src/BSON/Timestamp.c
@@ -263,7 +263,6 @@ static void php_phongo_timestamp_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/BSON/UTCDateTime.c b/src/BSON/UTCDateTime.c
@@ -303,7 +303,6 @@ static void php_phongo_utcdatetime_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 }
 
diff --git a/src/MongoDB/Manager.c b/src/MongoDB/Manager.c
@@ -799,7 +799,6 @@ static void php_phongo_manager_free_object(zend_object* object)
 
 	if (intern->subscribers) {
 		zend_hash_destroy(intern->subscribers);
-		FREE_HASHTABLE(intern->subscribers);
 	}
 }
 
diff --git a/src/MongoDB/ReadConcern.c b/src/MongoDB/ReadConcern.c
@@ -185,7 +185,6 @@ static void php_phongo_readconcern_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 
 	if (intern->read_concern) {
diff --git a/src/MongoDB/ReadPreference.c b/src/MongoDB/ReadPreference.c
@@ -485,7 +485,6 @@ static void php_phongo_readpreference_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 
 	if (intern->read_preference) {
diff --git a/src/MongoDB/ServerApi.c b/src/MongoDB/ServerApi.c
@@ -213,7 +213,6 @@ static void php_phongo_serverapi_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 
 	if (intern->server_api) {
diff --git a/src/MongoDB/ServerDescription.c b/src/MongoDB/ServerDescription.c
@@ -160,7 +160,6 @@ static void php_phongo_serverdescription_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 
 	if (intern->server_description) {
diff --git a/src/MongoDB/TopologyDescription.c b/src/MongoDB/TopologyDescription.c
@@ -109,7 +109,6 @@ static void php_phongo_topologydescription_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 
 	if (intern->topology_description) {
diff --git a/src/MongoDB/WriteConcern.c b/src/MongoDB/WriteConcern.c
@@ -370,7 +370,6 @@ static void php_phongo_writeconcern_free_object(zend_object* object)
 
 	if (intern->properties) {
 		zend_hash_destroy(intern->properties);
-		FREE_HASHTABLE(intern->properties);
 	}
 
 	if (intern->write_concern) {

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,6 @@ static void php_phongo_binary_free_object(zend_object* object)`
`215`	`215`
`216`	`216`	`if (intern->properties) {`
`217`	`217`	`zend_hash_destroy(intern->properties);`
`218`		`- FREE_HASHTABLE(intern->properties);`
`219`	`218`	`}`
`220`	`219`	`}`
`221`	`220`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,6 @@ static void php_phongo_dbpointer_free_object(zend_object* object)`
`178`	`178`
`179`	`179`	`if (intern->properties) {`
`180`	`180`	`zend_hash_destroy(intern->properties);`
`181`		`- FREE_HASHTABLE(intern->properties);`
`182`	`181`	`}`
`183`	`182`	`}`
`184`	`183`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,6 @@ static void php_phongo_decimal128_free_object(zend_object* object)`
`170`	`170`
`171`	`171`	`if (intern->properties) {`
`172`	`172`	`zend_hash_destroy(intern->properties);`
`173`		`- FREE_HASHTABLE(intern->properties);`
`174`	`173`	`}`
`175`	`174`	`}`
`176`	`175`
Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,6 @@ static void php_phongo_document_free_object(zend_object* object)`
`448`	`448`
`449`	`449`	`if (intern->properties) {`
`450`	`450`	`zend_hash_destroy(intern->properties);`
`451`		`- FREE_HASHTABLE(intern->properties);`
`452`	`451`	`}`
`453`	`452`	`}`
`454`	`453`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,6 @@ static void php_phongo_int64_free_object(zend_object* object)`
`177`	`177`
`178`	`178`	`if (intern->properties) {`
`179`	`179`	`zend_hash_destroy(intern->properties);`
`180`		`- FREE_HASHTABLE(intern->properties);`
`181`	`180`	`}`
`182`	`181`	`}`
`183`	`182`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,6 @@ static void php_phongo_iterator_free_object(zend_object* object)`
`250`	`250`
`251`	`251`	`if (intern->properties) {`
`252`	`252`	`zend_hash_destroy(intern->properties);`
`253`		`- FREE_HASHTABLE(intern->properties);`
`254`	`253`	`}`
`255`	`254`
`256`	`255`	`php_phongo_iterator_free_current(intern);`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,6 @@ static void php_phongo_javascript_free_object(zend_object* object)`
`264`	`264`
`265`	`265`	`if (intern->properties) {`
`266`	`266`	`zend_hash_destroy(intern->properties);`
`267`		`- FREE_HASHTABLE(intern->properties);`
`268`	`267`	`}`
`269`	`268`	`}`
`270`	`269`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,6 @@ static void php_phongo_objectid_free_object(zend_object* object)`
`204`	`204`
`205`	`205`	`if (intern->properties) {`
`206`	`206`	`zend_hash_destroy(intern->properties);`
`207`		`- FREE_HASHTABLE(intern->properties);`
`208`	`207`	`}`
`209`	`208`	`}`
`210`	`209`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,6 @@ static void php_phongo_packedarray_free_object(zend_object* object)`
`432`	`432`
`433`	`433`	`if (intern->properties) {`
`434`	`434`	`zend_hash_destroy(intern->properties);`
`435`		`- FREE_HASHTABLE(intern->properties);`
`436`	`435`	`}`
`437`	`436`	`}`
`438`	`437`