Merge pull request #89 from rrthomas/master

Remove if-before-free

4 files changed, 12 insertions, 29 deletions

diff --git a/src/hspell/hspell_provider.c b/src/hspell/hspell_provider.c
index 0844548..99e7287 100644
--- a/src/hspell/hspell_provider.c
+++ b/src/hspell/hspell_provider.c
@@ -115,8 +115,7 @@ hspell_dict_check (EnchantDict * me, const char *const word, size_t len)
 	/* check if hebrew ( if not hebrew give it the benefit of a doubt ) */
 	if (iso_word == NULL || !is_hebrew (iso_word, length))
 		{
-			if (iso_word)
-				g_free (iso_word);
+			g_free (iso_word);
 			return FALSE;
 		}
 	
@@ -155,8 +154,7 @@ hspell_dict_suggest (EnchantDict * me, const char *const word,
 	/* check if hebrew ( if not hebrew cant do anything ) */
 	if (iso_word == NULL || !is_hebrew (iso_word, length))
 		{
-			if (iso_word != NULL)
-				g_free (iso_word);
+			g_free (iso_word);
 			return NULL;
 		}
 
diff --git a/src/ispell/ispell_checker.cpp b/src/ispell/ispell_checker.cpp
index 38b144f..fcc9dd4 100644
--- a/src/ispell/ispell_checker.cpp
+++ b/src/ispell/ispell_checker.cpp
@@ -117,10 +117,6 @@ ISpellChecker::ISpellChecker(EnchantBroker * broker)
 	memset(m_pflagindex,0,sizeof(m_pflagindex));
 }
 
-#ifndef FREEP
-#define FREEP(p)        do { if (p) free(p); } while (0)
-#endif
-
 ISpellChecker::~ISpellChecker()
 {
 	if (m_bSuccessfulInit) {
@@ -130,10 +126,10 @@ ISpellChecker::~ISpellChecker()
 		clearindex (m_sflagindex);
 	}
 
-	FREEP(m_hashtbl);
-	FREEP(m_hashstrings);
-	FREEP(m_sflaglist);
-	FREEP(m_chartypes);
+	free(m_hashtbl);
+	free(m_hashstrings);
+	free(m_sflaglist);
+	free(m_chartypes);
 	                                                	
 	if (g_iconv_is_valid (m_translate_in ))
 		g_iconv_close(m_translate_in);
diff --git a/src/pwl.c b/src/pwl.c
index 7fca41c..8c2629b 100644
--- a/src/pwl.c
+++ b/src/pwl.c
@@ -790,10 +790,7 @@ static void enchant_trie_free(EnchantTrie* trie)
 		g_hash_table_destroy(trie->subtries);
 	}
 
-	if (trie->value != NULL) {
-		g_free(trie->value);
-	}
-
+	g_free(trie->value);
 	g_free(trie);
 }
 
diff --git a/tests/enchant-lsmod.c b/tests/enchant-lsmod.c
index bca3c41..6ed3f4f 100644
--- a/tests/enchant-lsmod.c
+++ b/tests/enchant-lsmod.c
@@ -87,21 +87,18 @@ main (int argc, char **argv)
 				lang_tag = enchant_get_user_language();
 
 				if (!lang_tag || !strcmp (lang_tag, "C")) {
-					if (lang_tag) /* lang might be "C" */
-						g_free (lang_tag);
+					g_free(lang_tag); /* lang might be "C" */
 					lang_tag = g_strdup ("en");
 				}
 			}
 			mode = 1;
 		} else if (!strcmp (argv[i], "-h") || !strcmp (argv[i], "-?") || !strcmp(argv[i], "-help")) {
 			printf ("%s [-lang [language_tag]] [-list-dicts] [-h] [-v]\n", argv[0]);
-			if (lang_tag)
-				g_free (lang_tag);
+			g_free (lang_tag);
 			return 0;
 		} else if (!strcmp (argv[i], "-v") || !strcmp (argv[i], "-version")) {
 			printf ("%s %s\n", argv[0], PACKAGE_VERSION);
-			if (lang_tag)
-				g_free (lang_tag);
+			g_free (lang_tag);
 			return 0;
 		} else if (!strcmp (argv[i], "-list-dicts")) {
 			mode = 2;
@@ -124,10 +121,7 @@ main (int argc, char **argv)
 		
 		if (!dict) {
 			printf ("No dictionary available for '%s'.\n", lang_tag);
-
-			if (lang_tag)
-				g_free (lang_tag);
-
+			g_free (lang_tag);
 			enchant_broker_free (broker);
 			return 1;
 		} else {
@@ -138,9 +132,7 @@ main (int argc, char **argv)
 		enchant_broker_list_dicts (broker, enumerate_dicts, stdout);
 	}
 
-	if (lang_tag)
-		g_free (lang_tag);
-	
+	g_free (lang_tag);
 	enchant_broker_free (broker);
 	
 	return 0;