sr: Implement proper logging framework.

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 83eef0879c48c72cfdf812cc09ad5c6fe067b40b..50fec3997874014b395f262e3f5a822342c13580 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -398,8 +398,6 @@ static void datafeed_in(struct sr_device *device, struct sr_datafeed_packet *pac
                sample_size = logic->unitsize;
                g_message("cli: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length);
                break;
-       case SR_DF_ANALOG:
-               break;
        }
 
        /* not supporting anything but SR_DF_LOGIC for now */
@@ -988,15 +986,15 @@ int main(int argc, char **argv)
        }
 
        /* Set the loglevel (amount of messages to output) for libsigrok. */
-       if (sr_set_loglevel(opt_loglevel) != SR_OK) {
-               fprintf(stderr, "cli: %s: sr_set_loglevel(%d) failed\n",
+       if (sr_log_loglevel_set(opt_loglevel) != SR_OK) {
+               fprintf(stderr, "cli: %s: sr_log_loglevel_set(%d) failed\n",
                        __func__, opt_loglevel);
                return 1;
        }
 
        /* Set the loglevel (amount of messages to output) for libsigrokdecode. */
-       if (srd_set_loglevel(opt_loglevel) != SRD_OK) {
-               fprintf(stderr, "cli: %s: srd_set_loglevel(%d) failed\n",
+       if (srd_log_loglevel_set(opt_loglevel) != SRD_OK) {
+               fprintf(stderr, "cli: %s: srd_log_loglevel_set(%d) failed\n",
                        __func__, opt_loglevel);
                return 1;
        }