From: Uwe Hermann <redacted>
Date: Thu, 17 May 2018 19:09:48 +0000 (+0200)
Subject: input/logicport: Drop some unneeded allocation checks.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7102443a4adb1743c5a053deee8fd2a93670fc19;p=libsigrok.git

input/logicport: Drop some unneeded allocation checks.
---

diff --git a/src/input/logicport.c b/src/input/logicport.c
index 40921be5..99ad2c84 100644
--- a/src/input/logicport.c
+++ b/src/input/logicport.c
@@ -141,15 +141,8 @@ static struct signal_group_desc *alloc_signal_group(const char *name)
 	struct signal_group_desc *desc;
 
 	desc = g_malloc0(sizeof(*desc));
-	if (!desc)
-		return NULL;
-	if (name) {
+	if (name)
 		desc->name = g_strdup(name);
-		if (!desc->name) {
-			g_free(desc);
-			return NULL;
-		}
-	}
 
 	return desc;
 }
@@ -167,15 +160,8 @@ struct sr_channel_group *sr_channel_group_new(const char *name, void *priv)
 	struct sr_channel_group *cg;
 
 	cg = g_malloc0(sizeof(*cg));
-	if (!cg)
-		return NULL;
-	if (name && *name) {
+	if (name && *name)
 		cg->name = g_strdup(name);
-		if (!cg->name) {
-			g_free(cg);
-			return NULL;
-		}
-	}
 	cg->priv = priv;
 
 	return cg;
@@ -1068,10 +1054,7 @@ static int init(struct sr_input *in, GHashTable *options)
 	(void)options;
 
 	in->sdi = g_malloc0(sizeof(*in->sdi));
-
 	inc = g_malloc0(sizeof(*inc));
-	if (!inc)
-		return SR_ERR_MALLOC;
 	in->priv = inc;
 
 	return SR_OK;