X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fols.c;h=a6ce6ea72846f072c071217d5829c9d9f67e6f86;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=16b288aca1bdf2116edc62176baa43f29b5239f9;hpb=0da5b6a9f5a119ab485ed3dba08aeb4a3ad2c8f4;p=libsigrok.git

diff --git a/output/ols.c b/output/ols.c
index 16b288ac..a6ce6ea7 100644
--- a/output/ols.c
+++ b/output/ols.c
@@ -2,7 +2,7 @@
  * This file is part of the sigrok project.
  *
  * Copyright (C) 2011 Uwe Hermann <uwe@hermann-uwe.de>
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include <glib.h>
 #include "sigrok.h"
 #include "sigrok-internal.h"
-#include "config.h"
 
 struct context {
 	GString *header;
@@ -61,7 +60,7 @@ static int init(struct sr_output *o)
 	}
 	ctx->unitsize = (num_enabled_probes + 7) / 8;
 
-	if (o->device->plugin && sr_device_has_hwcap(o->device, SR_HWCAP_SAMPLERATE))
+	if (o->device->plugin && 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));
 	else
@@ -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,