serial: Shorten a few code snippets.

[libsigrok.git] / src / serial_bt.c

diff --git a/src/serial_bt.c b/src/serial_bt.c
index 37a1a68b0ad2147d5b540c10b49ec53773fcb59f..8ed4523b8167ee1f42686d1ff9309f3b0f9c8c8f 100644 (file)
--- a/src/serial_bt.c
+++ b/src/serial_bt.c
@@ -494,10 +494,8 @@ static int ser_bt_read(struct sr_serial_dev_inst *serial,
         * Immediately satisfy the caller's request from the RX buffer
         * if the requested amount of data is available already.
         */
-       if (sr_ser_has_queued_data(serial) >= count) {
-               rc = sr_ser_unqueue_rx_data(serial, buf, count);
-               return rc;
-       }
+       if (sr_ser_has_queued_data(serial) >= count)
+               return sr_ser_unqueue_rx_data(serial, buf, count);
 
        /*
         * When a timeout was specified, then determine the deadline
@@ -766,9 +764,8 @@ static void scan_cb(void *cb_args, const char *addr, const char *name)
 
        /* Check whether the device was seen before. */
        for (l = scan_args->addr_list; l; l = l->next) {
-               if (strcmp(addr, l->data) == 0) {
+               if (strcmp(addr, l->data) == 0)
                        return;
-               }
        }
 
        /* Substitute colons in the address by dashes. */