Use g_try_malloc/g_free/g_strdup consistently.

[libsigrok.git] / output / ols.c

diff --git a/output/ols.c b/output/ols.c
index 16b288aca1bdf2116edc62176baa43f29b5239f9..dff54a42d607abab3ad7d904551363a942311b04 100644 (file)
--- a/output/ols.c
+++ b/output/ols.c
@@ -30,7 +30,6 @@
 #include <glib.h>
 #include "sigrok.h"
 #include "sigrok-internal.h"
-#include "config.h"
 
 struct context {
        GString *header;
@@ -85,9 +84,8 @@ static int event(struct sr_output *o, int event_type, char **data_out,
        ctx = o->internal;
 
        if (ctx && event_type == SR_DF_END) {
-               if (ctx->header)
-                       g_string_free(ctx->header, TRUE);
-               free(o->internal);
+               g_string_free(ctx->header, TRUE);
+               g_free(o->internal);
                o->internal = NULL;
        }
 
@@ -126,7 +124,7 @@ static int data(struct sr_output *o, const char *data_in, uint64_t length_in,
        return SR_OK;
 }
 
-struct sr_output_format output_ols = {
+SR_PRIV struct sr_output_format output_ols = {
        .id = "ols",
        .description = "OpenBench Logic Sniffer",
        .df_type = SR_DF_LOGIC,