cleanup

Author: remicollet

ext/enchant/enchant.c

@@ -166,10 +166,8 @@ static void php_enchant_broker_free(zend_object *object) /* {{{ */
 {
 	enchant_broker *broker = enchant_broker_from_obj(object);
 
-	if (broker) {
-		if (broker->pbroker) {  /* may have been freed by enchant_broker_free */
-			enchant_broker_free(broker->pbroker);
-		}
+	if (broker->pbroker) {  /* may have been freed by enchant_broker_free */
+		enchant_broker_free(broker->pbroker);
 	}
 	zend_object_std_dtor(object);
 }
@@ -180,15 +178,13 @@ static void php_enchant_dict_free(zend_object *object) /* {{{ */
 {
 	enchant_dict *dict = enchant_dict_from_obj(object);
 
-	if (dict) {
-		if (dict->pdict) { /* may have been freed by enchant_broker_free_dict */
-			enchant_broker *broker = Z_ENCHANT_BROKER_P(&dict->zbroker);
+	if (dict->pdict) { /* may have been freed by enchant_broker_free_dict */
+		enchant_broker *broker = Z_ENCHANT_BROKER_P(&dict->zbroker);
 
-			if (broker && broker->pbroker) {
-				enchant_broker_free_dict(broker->pbroker, dict->pdict);
-				broker->nb_dict--;
-				zval_ptr_dtor(&dict->zbroker);
-			}
+		if (broker && broker->pbroker) {
+			enchant_broker_free_dict(broker->pbroker, dict->pdict);
+			broker->nb_dict--;
+			zval_ptr_dtor(&dict->zbroker);
 		}
 	}
 	zend_object_std_dtor(object);
@@ -276,14 +272,14 @@ PHP_MINFO_FUNCTION(enchant)
 
 #define PHP_ENCHANT_GET_BROKER	\
 	pbroker = Z_ENCHANT_BROKER_P(broker); \
-	if (!pbroker || !pbroker->pbroker) {	\
+	if (!pbroker->pbroker) {	\
 		zend_value_error("Invalid or uninitialized EnchantBroker object"); \
 		RETURN_THROWS(); \
 	}
 
 #define PHP_ENCHANT_GET_DICT	\
 	pdict = Z_ENCHANT_DICT_P(dict); \
-	if (!pdict || !pdict->pdict) {	\
+	if (!pdict->pdict) {	\
 		zend_value_error("Invalid or uninitialized EnchantDict object"); \
 		RETURN_THROWS(); \
 	}
@@ -535,8 +531,8 @@ PHP_METHOD(EnchantDict, __construct)
 	PHP_ENCHANT_GET_BROKER;
 
 	if (taglen == 0) {
-		php_error_docref(NULL, E_WARNING, "Tag cannot be empty");
-		RETURN_FALSE;
+		zend_value_error("Tag cannot be empty");
+		RETURN_THROWS();
 	}
 
 	pdict = enchant_broker_request_dict(pbroker->pbroker, (const char *)tag);

ext/enchant/tests/invalidobj.phpt

@@ -9,15 +9,15 @@ if (!is_object(enchant_broker_init())) {die("skip, resource dont load\n");}
 <?php
 $broker = enchant_broker_init();
 if (is_object($broker)) {
-    echo "OK\n";
-    @enchant_broker_free($broker);
+	echo "OK\n";
+	@enchant_broker_free($broker);
 	try {
-	    @enchant_broker_free($broker);
+		@enchant_broker_free($broker);
 	} catch (ValueError $e) {
 		echo $e->getMessage()."\n";
 	}
 } else {
-    exit("init failed\n");
+	exit("init failed\n");
 }
 echo "OK\n";
 ?>