X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fphp_http_message.c;h=49aa0f94a1af971d81cef82042e806d0e323b825;hb=refs%2Ftags%2FRELEASE_3_2_0_RC1;hp=d076b6aef6173a69e914d24a3135c208535ee083;hpb=7a492dc2544d408eb65fd38cb644fd6adde3bbe9;p=m6w6%2Fext-http

diff --git a/src/php_http_message.c b/src/php_http_message.c
index d076b6a..49aa0f9 100644
--- a/src/php_http_message.c
+++ b/src/php_http_message.c
@@ -177,24 +177,24 @@ zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary
 		popts.input.str = ct->val;
 		popts.input.len = ct->len;
 
-		if (php_http_params_parse(&params, &popts)) {
+		if (EXPECTED(php_http_params_parse(&params, &popts))) {
 			zval *cur, *arg;
 			zend_string *ct_str;
 			zend_ulong index;
 
 			zend_hash_internal_pointer_reset(&params);
 
-			if ((cur = zend_hash_get_current_data(&params))
+			if (EXPECTED((cur = zend_hash_get_current_data(&params))
 			&&	(Z_TYPE_P(cur) == IS_ARRAY)
-			&&	(HASH_KEY_IS_STRING == zend_hash_get_current_key(&params, &ct_str, &index))
+			&&	(HASH_KEY_IS_STRING == zend_hash_get_current_key(&params, &ct_str, &index)))
 			) {
 				if (php_http_match(ct_str->val, "multipart", PHP_HTTP_MATCH_WORD)) {
 					is_multipart = 1;
 
 					/* get boundary */
-					if (boundary
+					if (EXPECTED(boundary
 					&&	(arg = zend_hash_str_find(Z_ARRVAL_P(cur), ZEND_STRL("arguments")))
-					&&	Z_TYPE_P(arg) == IS_ARRAY
+					&&	Z_TYPE_P(arg) == IS_ARRAY)
 					) {
 						zval *val;
 						php_http_arrkey_t key;
@@ -204,7 +204,7 @@ zend_bool php_http_message_is_multipart(php_http_message_t *msg, char **boundary
 							if (key.key && key.key->len == lenof("boundary") && !strcasecmp(key.key->val, "boundary")) {
 								zend_string *bnd = zval_get_string(val);
 
-								if (bnd->len) {
+								if (EXPECTED(bnd->len)) {
 									*boundary = estrndup(bnd->val, bnd->len);
 								}
 								zend_string_release(bnd);
@@ -471,7 +471,7 @@ php_http_message_t *php_http_message_copy_ex(php_http_message_t *from, php_http_
 
 void php_http_message_dtor(php_http_message_t *message)
 {
-	if (message) {
+	if (EXPECTED(message)) {
 		zend_hash_destroy(&message->hdrs);
 		php_http_message_body_free(&message->body);
 
@@ -493,7 +493,7 @@ void php_http_message_dtor(php_http_message_t *message)
 
 void php_http_message_free(php_http_message_t **message)
 {
-	if (*message) {
+	if (EXPECTED(*message)) {
 		if ((*message)->parent) {
 			php_http_message_free(&(*message)->parent);
 		}
@@ -640,9 +640,7 @@ static void php_http_message_object_prophandler_set_headers(php_http_message_obj
 	zend_hash_init(&obj->message->hdrs, zend_hash_num_elements(src), NULL, ZVAL_PTR_DTOR, 0);
 	array_copy(HASH_OF(value), &obj->message->hdrs);
 
-	if (GC_REFCOUNT(&garbage) <= 1 && (garbage.u.flags & HASH_FLAG_INITIALIZED)) {
-		efree(HT_GET_DATA_ADDR(&garbage));
-	}
+	zend_hash_destroy(&garbage);
 
 	if (converted) {
 		zval_ptr_dtor(value);
@@ -860,7 +858,7 @@ php_http_message_object_t *php_http_message_object_new_ex(zend_class_entry *ce,
 
 zend_object *php_http_message_object_clone(zval *this_ptr)
 {
-	php_http_message_object_t *new_obj = NULL;
+	php_http_message_object_t *new_obj;
 	php_http_message_object_t *old_obj = PHP_HTTP_OBJ(NULL, this_ptr);
 
 	new_obj = php_http_message_object_new_ex(old_obj->zo.ce, php_http_message_copy(old_obj->message, NULL));