X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Foutput%2Fcsv.c;h=ecbf562de27af1c33ab912023c94b571ed667ba7;hb=739a1ec4f8714ee77f19c393345a67d321982c11;hp=5f0d647c3d5605be98cc1c883b85be2a29b377ef;hpb=3cd4b381744eb88fd4ba32565bd408c33b431629;p=libsigrok.git

diff --git a/src/output/csv.c b/src/output/csv.c
index 5f0d647c..ecbf562d 100644
--- a/src/output/csv.c
+++ b/src/output/csv.c
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "config.h" /* Needed for PACKAGE_STRING and others. */
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "output/csv"
@@ -118,8 +118,8 @@ static GString *gen_header(const struct sr_output *o)
 
 	/* Some metadata */
 	t = time(NULL);
-	g_string_append_printf(header, "; CSV, generated by %s on %s",
-			PACKAGE_STRING, ctime(&t));
+	g_string_append_printf(header, "; CSV, generated by %s %s on %s",
+			PACKAGE_NAME, SR_PACKAGE_VERSION_STRING, ctime(&t));
 
 	/* Columns / channels */
 	num_channels = g_slist_length(o->sdi->channels);
@@ -224,7 +224,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 		 */
 		memset(ctx->analog_vals, 0, sizeof(float) * ctx->num_analog_channels);
 		ctx->inframe = TRUE;
-		ret = SR_OK_CONTINUE;
+		ret = SR_OK;
 		break;
 	case SR_DF_FRAME_END:
 		/*
@@ -270,7 +270,6 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 
 		if (ctx->inframe) {
 			handle_analog_frame(ctx, analog);
-			ret = SR_OK_CONTINUE;
 			break;
 		}