Rename 'void *' callback parameters to 'user_data'.

This is better, both for consistency reasons, and also because 'data' is
a bit too generic and might be confusing, especially since we have other
'data' fields in the code in various places.

diff --git a/sigrok-cli.c b/sigrok-cli.c
index fc6884be07b349df565b2bd1d6382394df7d9e55..a9e30017b85b9016cd051f47eee7a6a47e054a43 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -130,7 +130,7 @@ static void print_device_line(const struct sr_device *device)
 {
        const struct sr_device_instance *sdi;
 
 {
        const struct sr_device_instance *sdi;
 

-       sr_device_get_info(device, SR_DI_INSTANCE, (const void **) &sdi);
+       sr_device_get_info(device, SR_DI_INSTANCE, (const void **)&sdi);

 
        if (sdi->vendor && sdi->vendor[0])
                printf("%s ", sdi->vendor);
 
        if (sdi->vendor && sdi->vendor[0])
                printf("%s ", sdi->vendor);


@@ -190,7 +190,7 @@ static void show_device_detail(void)
        print_device_line(device);
 
        if (sr_device_get_info(device, SR_DI_TRIGGER_TYPES,
        print_device_line(device);
 
        if (sr_device_get_info(device, SR_DI_TRIGGER_TYPES,

-                                                  (const void **) &charopts) == SR_OK) {
+                                       (const void **)&charopts) == SR_OK) {

                printf("Supported triggers: ");
                while (*charopts) {
                        printf("%c ", *charopts);
                printf("Supported triggers: ");
                while (*charopts) {
                        printf("%c ", *charopts);


@@ -213,7 +213,7 @@ static void show_device_detail(void)
                if (hwo->capability == SR_HWCAP_PATTERN_MODE) {
                        printf("    %s", hwo->shortname);
                        if (sr_device_get_info(device, SR_DI_PATTERNMODES,
                if (hwo->capability == SR_HWCAP_PATTERN_MODE) {
                        printf("    %s", hwo->shortname);
                        if (sr_device_get_info(device, SR_DI_PATTERNMODES,

-                                                                  (const void **) &stropts) == SR_OK) {
+                                       (const void **)&stropts) == SR_OK) {

                                printf(" - supported modes:\n");
                                for (i = 0; stropts[i]; i++)
                                        printf("      %s\n", stropts[i]);
                                printf(" - supported modes:\n");
                                for (i = 0; stropts[i]; i++)
                                        printf("      %s\n", stropts[i]);


@@ -224,7 +224,7 @@ static void show_device_detail(void)
                        printf("    %s", hwo->shortname);
                        /* Supported samplerates */
                        if (sr_device_get_info(device, SR_DI_SAMPLERATES,
                        printf("    %s", hwo->shortname);
                        /* Supported samplerates */
                        if (sr_device_get_info(device, SR_DI_SAMPLERATES,

-                                                                  (const void **) &samplerates) != SR_OK) {
+                                       (const void **)&samplerates) != SR_OK) {

                                printf("\n");
                                continue;
                        }
                                printf("\n");
                                continue;
                        }


@@ -510,13 +510,13 @@ err_out:
        return 0;
 }
 
        return 0;
 }
 

-void show_pd_annotation(struct srd_proto_data *pdata, void *data)
+void show_pd_annotation(struct srd_proto_data *pdata, void *user_data)

 {
        int i;
        char **annotations;
 
 {
        int i;
        char **annotations;
 

-       /* 'data' is not used in this specific callback. */
-       (void)data;
+       /* 'user_data' is not used in this specific callback. */
+       (void)user_data;

 
        if (pdata->ann_format != 0) {
                /* CLI only shows the default annotation format. */
 
        if (pdata->ann_format != 0) {
                /* CLI only shows the default annotation format. */


@@ -883,8 +883,8 @@ static void run_session(void)
                                const uint64_t *samplerate;
 
                                sr_device_get_info(device, SR_DI_CUR_SAMPLERATE,
                                const uint64_t *samplerate;
 
                                sr_device_get_info(device, SR_DI_CUR_SAMPLERATE,

-                                                                  (const void **) &samplerate);
-                               limit_samples = (*samplerate) * time_msec / (uint64_t) 1000;
+                                               (const void **)&samplerate);
+                               limit_samples = (*samplerate) * time_msec / (uint64_t)1000;

                        }
                        if (limit_samples == 0) {
                                printf("Not enough time at this samplerate.\n");
                        }
                        if (limit_samples == 0) {
                                printf("Not enough time at this samplerate.\n");