sr: rename all sr_device_* functions to sr_dev_*

[libsigrok.git] / output / chronovu_la8.c

diff --git a/output/chronovu_la8.c b/output/chronovu_la8.c
index 6ef99dafbfc6621cb58d9f7c67385af8c840de16..830f42695552c1ac0d702d84008a114acf91c139 100644 (file)
--- a/output/chronovu_la8.c
+++ b/output/chronovu_la8.c
@@ -102,8 +102,8 @@ static int init(struct sr_output *o)
                return SR_ERR_ARG;
        }
 
-       if (!(ctx = calloc(1, sizeof(struct context)))) {
-               sr_warn("la8 out: %s: ctx calloc failed", __func__);
+       if (!(ctx = g_try_malloc0(sizeof(struct context)))) {
+               sr_warn("la8 out: %s: ctx malloc failed", __func__);
                return SR_ERR_MALLOC;
        }
 
@@ -122,7 +122,7 @@ static int init(struct sr_output *o)
 
        num_probes = g_slist_length(o->device->probes);
 
-       if (sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
+       if (sr_dev_has_hwcap(o->device, SR_HWCAP_SAMPLERATE)) {
                samplerate = *((uint64_t *) o->device->plugin->get_device_info(
                                o->device->plugin_index, SR_DI_CUR_SAMPLERATE));
                /* TODO: Error checks. */
@@ -163,7 +163,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
                break;
        case SR_DF_END:
                sr_dbg("la8 out: %s: SR_DF_END event", __func__);
-               if (!(outbuf = malloc(4 + 1))) {
+               if (!(outbuf = g_try_malloc(4 + 1))) {
                        sr_warn("la8 out: %s: outbuf malloc failed", __func__);
                        return SR_ERR_MALLOC;
                }
@@ -183,7 +183,7 @@ static int event(struct sr_output *o, int event_type, char **data_out,
 
                *data_out = outbuf;
                *length_out = 4 + 1;
-               free(o->internal);
+               g_free(o->internal);
                o->internal = NULL;
                break;
        default:
@@ -218,8 +218,8 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
                return SR_ERR_ARG;
        }
 
-       if (!(outbuf = calloc(1, length_in))) {
-               sr_warn("la8 out: %s: outbuf calloc failed", __func__);
+       if (!(outbuf = g_try_malloc0(length_in))) {
+               sr_warn("la8 out: %s: outbuf malloc failed", __func__);
                return SR_ERR_MALLOC;
        }