]> sigrok.org Git - libsigrok.git/commitdiff
ipdbg-la: Drop unneeded g_malloc0() checks for small allocations.
authorUwe Hermann <redacted>
Wed, 29 Aug 2018 22:52:19 +0000 (00:52 +0200)
committerUwe Hermann <redacted>
Wed, 29 Aug 2018 22:52:19 +0000 (00:52 +0200)
src/hardware/ipdbg-la/api.c
src/hardware/ipdbg-la/protocol.c

index 6a8f261b6769f2d881a054af1374b1ec1649feb9..599960938c7b41fa998893379ceca14b137d8dc4 100644 (file)
@@ -97,11 +97,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                return NULL;
 
        struct sr_dev_inst *sdi = g_malloc0(sizeof(struct sr_dev_inst));
-       if (!sdi) {
-               sr_err("no possible to allocate sr_dev_inst");
-               return NULL;
-       }
-
        sdi->status = SR_ST_INACTIVE;
        sdi->vendor = g_strdup("ipdbg.org");
        sdi->model = g_strdup("IPDBG LA");
index c9fc45a472629f1792b5d5a24afa6480bd9baeee..d02ec73720c8150c553c368513bce41262af4ef8 100644 (file)
@@ -89,7 +89,6 @@ SR_PRIV struct ipdbg_la_tcp *ipdbg_la_tcp_new(void)
        struct ipdbg_la_tcp *tcp;
 
        tcp = g_malloc0(sizeof(struct ipdbg_la_tcp));
-
        tcp->address = NULL;
        tcp->port = NULL;
        tcp->socket = -1;
@@ -308,7 +307,7 @@ SR_PRIV int ipdbg_la_receive_data(int fd, int revents, void *cb_data)
                devc->raw_sample_buf =
                        g_try_malloc(devc->limit_samples * devc->DATA_WIDTH_BYTES);
                if (!devc->raw_sample_buf) {
-                       sr_warn("Sample buffer malloc failed.");
+                       sr_err("Sample buffer malloc failed.");
                        return FALSE;
                }
        }