sr: Name all callback data 'cb_data'.

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

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 4bd2de41b7095f1800781cb57abae7a57dcf7dda..d5427a785b82e4287799363d09c77be30e07ef7c 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -95,7 +95,7 @@ static void show_version(void)
        printf("sigrok-cli %s\n\n", VERSION);
 
        printf("Supported hardware drivers:\n");
-       drivers = sr_hw_list();
+       drivers = sr_driver_list();
        for (i = 0; drivers[i]; i++) {
                printf("  %-20s %s\n", drivers[i]->name, drivers[i]->longname);
        }
@@ -514,13 +514,13 @@ err_out:
        return 0;
 }
 
-void show_pd_annotation(struct srd_proto_data *pdata, void *user_data)
+void show_pd_annotation(struct srd_proto_data *pdata, void *cb_data)
 {
        int i;
        char **annotations;
 
-       /* 'user_data' is not used in this specific callback. */
-       (void)user_data;
+       /* 'cb_data' is not used in this specific callback. */
+       (void)cb_data;
 
        if (pdata->ann_format != 0) {
                /* CLI only shows the default annotation format. */
@@ -836,7 +836,7 @@ static void run_session(void)
             return;
 
        if (opt_continuous) {
-               if (!sr_hw_has_hwcap(dev->driver, SR_HWCAP_CONTINUOUS)) {
+               if (!sr_driver_hwcap_exists(dev->driver, SR_HWCAP_CONTINUOUS)) {
                        printf("This device does not support continuous sampling.");
                        sr_session_destroy();
                        return;
@@ -868,7 +868,7 @@ static void run_session(void)
                        return;
                }
 
-               if (sr_hw_has_hwcap(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
+               if (sr_driver_hwcap_exists(dev->driver, SR_HWCAP_LIMIT_MSEC)) {
                        if (dev->driver->dev_config_set(dev->driver_index,
                            SR_HWCAP_LIMIT_MSEC, &time_msec) != SR_OK) {
                                printf("Failed to configure time limit.\n");
@@ -943,11 +943,11 @@ static void run_session(void)
 }
 
 static void logger(const gchar *log_domain, GLogLevelFlags log_level,
-                  const gchar *message, gpointer user_data)
+                  const gchar *message, gpointer cb_data)
 {
        /* Avoid compiler warnings. */
        (void)log_domain;
-       (void)user_data;
+       (void)cb_data;
 
        /*
         * All messages, warnings, errors etc. go to stderr (not stdout) in