Fix OOM handling

8 files changed, 62 insertions, 62 deletions

diff --git a/liblangtag/lt-extlang-db.c b/liblangtag/lt-extlang-db.c
index ce8acda..3905757 100644
--- a/liblangtag/lt-extlang-db.c
+++ b/liblangtag/lt-extlang-db.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * lt-extlang-db.c
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2016 Akira TAGOH
  * 
  * Authors:
  *   Akira TAGOH  <akira@tagoh.org>
@@ -200,12 +200,12 @@ _lt_extlang_db_iter_init(lt_iter_tmpl_t *tmpl)
 	lt_extlang_db_t *extlangdb = (lt_extlang_db_t *)tmpl;
 
 	retval = malloc(sizeof (lt_extlang_db_iter_t));
-	if (retval) {
-		retval->iter = LT_ITER_INIT (extlangdb->extlang_entries);
-		if (!retval->iter) {
-			free(retval);
-			retval = NULL;
-		}
+	if (!retval)
+		return NULL;
+	retval->iter = LT_ITER_INIT (extlangdb->extlang_entries);
+	if (!retval->iter) {
+		free(retval);
+		return NULL;
 	}
 
 	return &retval->parent;
diff --git a/liblangtag/lt-grandfathered-db.c b/liblangtag/lt-grandfathered-db.c
index ffc2ca1..03cae56 100644
--- a/liblangtag/lt-grandfathered-db.c
+++ b/liblangtag/lt-grandfathered-db.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * lt-grandfathered-db.c
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2016 Akira TAGOH
  * 
  * Authors:
  *   Akira TAGOH  <akira@tagoh.org>
@@ -179,12 +179,12 @@ _lt_grandfathered_db_iter_init(lt_iter_tmpl_t *tmpl)
 	lt_grandfathered_db_t *db = (lt_grandfathered_db_t *)tmpl;
 
 	retval = malloc(sizeof (lt_grandfathered_db_iter_t));
-	if (retval) {
-		retval->iter = LT_ITER_INIT (db->grandfathered_entries);
-		if (!retval->iter) {
-			free(retval);
-			retval = NULL;
-		}
+	if (!retval)
+		return NULL;
+	retval->iter = LT_ITER_INIT (db->grandfathered_entries);
+	if (!retval->iter) {
+		free(retval);
+		return NULL;
 	}
 
 	return &retval->parent;
diff --git a/liblangtag/lt-lang-db.c b/liblangtag/lt-lang-db.c
index c08469e..37b59ab 100644
--- a/liblangtag/lt-lang-db.c
+++ b/liblangtag/lt-lang-db.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * lt-lang-db.c
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2016 Akira TAGOH
  * 
  * Authors:
  *   Akira TAGOH  <akira@tagoh.org>
@@ -212,12 +212,12 @@ _lt_lang_db_iter_init(lt_iter_tmpl_t *tmpl)
 	lt_lang_db_t *langdb = (lt_lang_db_t *)tmpl;
 
 	retval = malloc(sizeof (lt_lang_db_iter_t));
-	if (retval) {
-		retval->iter = LT_ITER_INIT (langdb->lang_entries);
-		if (!retval->iter) {
-			free(retval);
-			retval = NULL;
-		}
+	if (!retval)
+		return NULL;
+	retval->iter = LT_ITER_INIT (langdb->lang_entries);
+	if (!retval->iter) {
+		free(retval);
+		return NULL;
 	}
 
 	return &retval->parent;
diff --git a/liblangtag/lt-redundant-db.c b/liblangtag/lt-redundant-db.c
index cd120cc..7fe7b92 100644
--- a/liblangtag/lt-redundant-db.c
+++ b/liblangtag/lt-redundant-db.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * lt-redundant-db.c
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2016 Akira TAGOH
  * 
  * Authors:
  *   Akira TAGOH  <akira@tagoh.org>
@@ -180,12 +180,12 @@ _lt_redundant_db_iter_init(lt_iter_tmpl_t *tmpl)
 	lt_redundant_db_t *db = (lt_redundant_db_t *)tmpl;
 
 	retval = malloc(sizeof (lt_redundant_db_iter_t));
-	if (retval) {
-		retval->iter = LT_ITER_INIT (db->redundant_entries);
-		if (!retval->iter) {
-			free(retval);
-			retval = NULL;
-		}
+	if (!retval)
+		return NULL;
+	retval->iter = LT_ITER_INIT (db->redundant_entries);
+	if (!retval->iter) {
+		free(retval);
+		return NULL;
 	}
 
 	return &retval->parent;
diff --git a/liblangtag/lt-region-db.c b/liblangtag/lt-region-db.c
index 617686b..44b4558 100644
--- a/liblangtag/lt-region-db.c
+++ b/liblangtag/lt-region-db.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * lt-region-db.c
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2016 Akira TAGOH
  * 
  * Authors:
  *   Akira TAGOH  <akira@tagoh.org>
@@ -180,12 +180,12 @@ _lt_region_db_iter_init(lt_iter_tmpl_t *tmpl)
 	lt_region_db_t *db = (lt_region_db_t *)tmpl;
 
 	retval = malloc(sizeof (lt_region_db_iter_t));
-	if (retval) {
-		retval->iter = LT_ITER_INIT (db->region_entries);
-		if (!retval->iter) {
-			free(retval);
-			retval = NULL;
-		}
+	if (!retval)
+		return NULL;
+	retval->iter = LT_ITER_INIT (db->region_entries);
+	if (!retval->iter) {
+		free(retval);
+		return NULL;
 	}
 
 	return &retval->parent;
diff --git a/liblangtag/lt-script-db.c b/liblangtag/lt-script-db.c
index 831e9ec..34b0c3b 100644
--- a/liblangtag/lt-script-db.c
+++ b/liblangtag/lt-script-db.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * lt-script-db.c
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2016 Akira TAGOH
  * 
  * Authors:
  *   Akira TAGOH  <akira@tagoh.org>
@@ -167,12 +167,12 @@ _lt_script_db_iter_init(lt_iter_tmpl_t *tmpl)
 	lt_script_db_t *db = (lt_script_db_t *)tmpl;
 
 	retval = malloc(sizeof (lt_script_db_iter_t));
-	if (retval) {
-		retval->iter = LT_ITER_INIT (db->script_entries);
-		if (!retval->iter) {
-			free(retval);
-			retval = NULL;
-		}
+	if (!retval)
+		return NULL;
+	retval->iter = LT_ITER_INIT (db->script_entries);
+	if (!retval->iter) {
+		free(retval);
+		return NULL;
 	}
 
 	return &retval->parent;
diff --git a/liblangtag/lt-trie.c b/liblangtag/lt-trie.c
index de4b080..a9d8455 100644
--- a/liblangtag/lt-trie.c
+++ b/liblangtag/lt-trie.c
@@ -166,20 +166,20 @@ _lt_trie_iter_init(lt_iter_tmpl_t *tmpl)
 	int i;
 
 	trie_iter = malloc(sizeof (lt_trie_iter_t));
-	if (trie_iter) {
-		trie_iter->pos_str = lt_string_new(NULL);
-		trie_iter->last_key = NULL;
-		trie_iter->stack = NULL;
-		if (trie->root) {
-			lt_trie_node_t *node = trie->root;
-
-			for (i = 0; i < 255; i++) {
-				if (node->node[i])
-					trie_iter->stack = lt_list_append(trie_iter->stack, node->node[i], NULL);
-			}
-			/* add a terminator */
-			trie_iter->stack = lt_list_append(trie_iter->stack, NULL, NULL);
+	if (!trie_iter)
+		return NULL;
+	trie_iter->pos_str = lt_string_new(NULL);
+	trie_iter->last_key = NULL;
+	trie_iter->stack = NULL;
+	if (trie->root) {
+		lt_trie_node_t *node = trie->root;
+
+		for (i = 0; i < 255; i++) {
+			if (node->node[i])
+				trie_iter->stack = lt_list_append(trie_iter->stack, node->node[i], NULL);
 		}
+		/* add a terminator */
+		trie_iter->stack = lt_list_append(trie_iter->stack, NULL, NULL);
 	}
 
 	return &trie_iter->parent;
diff --git a/liblangtag/lt-variant-db.c b/liblangtag/lt-variant-db.c
index bb8ba92..eb2e1ae 100644
--- a/liblangtag/lt-variant-db.c
+++ b/liblangtag/lt-variant-db.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /* 
  * lt-variant-db.c
- * Copyright (C) 2011-2012 Akira TAGOH
+ * Copyright (C) 2011-2016 Akira TAGOH
  * 
  * Authors:
  *   Akira TAGOH  <akira@tagoh.org>
@@ -190,12 +190,12 @@ _lt_variant_db_iter_init(lt_iter_tmpl_t *tmpl)
 	lt_variant_db_t *db = (lt_variant_db_t *)tmpl;
 
 	retval = malloc(sizeof (lt_variant_db_iter_t));
-	if (retval) {
-		retval->iter = LT_ITER_INIT (db->variant_entries);
-		if (!retval->iter) {
-			free(retval);
-			retval = NULL;
-		}
+	if (!retval)
+		return NULL;
+	retval->iter = LT_ITER_INIT (db->variant_entries);
+	if (!retval->iter) {
+		free(retval);
+		return NULL;
 	}
 
 	return &retval->parent;