input/logicport: Fix outdated format_match().

[libsigrok.git] / src / input / logicport.c

diff --git a/src/input/logicport.c b/src/input/logicport.c
index 40921be5220810dcc46464d87e8b531351b58d4a..9986e0de0b7225d07f28b402ce56ae37ca99b75c 100644 (file)
--- 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;
@@ -1036,7 +1022,7 @@ static int prepare_session_feed(struct sr_input *in)
        return SR_OK;
 }
 
-static int format_match(GHashTable *metadata)
+static int format_match(GHashTable *metadata, unsigned int *confidence)
 {
        GString *buf, *tmpbuf;
        int rc;
@@ -1055,6 +1041,7 @@ static int format_match(GHashTable *metadata)
        if (rc == SR_OK && version && build) {
                sr_dbg("Looks like a LogicProbe project, version %s, build %s.",
                        version, build);
+               *confidence = 1;
        }
        g_string_free(tmpbuf, TRUE);
 
@@ -1068,10 +1055,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;