X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fcsv.c;h=cc09045aa281919a88580e681149724c7519300f;hb=d40b8557a962;hp=47fee73e7304aba095e998a7d65e50191428341f;hpb=5e23fcab889c62864b92aa3ad6902ce3e9f5be49;p=libsigrok.git

diff --git a/src/input/csv.c b/src/input/csv.c
index 47fee73e..cc09045a 100644
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/csv"
@@ -351,7 +351,7 @@ static int parse_single_column(const char *column, struct context *inc)
 
 	res = SR_ERR;
 
-	switch(inc->format) {
+	switch (inc->format) {
 	case FORMAT_BIN:
 		res = parse_binstr(column, inc);
 		break;
@@ -454,9 +454,9 @@ static int init(struct sr_input *in, GHashTable *options)
 	return SR_OK;
 }
 
-static char *get_line_termination(GString *buf)
+static const char *get_line_termination(GString *buf)
 {
-	char *term;
+	const char *term;
 
 	term = NULL;
 	if (g_strstr_len(buf->str, buf->len, "\r\n"))
@@ -581,7 +581,8 @@ static int initial_receive(const struct sr_input *in)
 	struct context *inc;
 	GString *new_buf;
 	int len, ret;
-	char *termination, *p;
+	char *p;
+	const char *termination;
 
 	inc = in->priv;
 
@@ -776,11 +777,8 @@ static void cleanup(struct sr_input *in)
 	if (inc->comment)
 		g_string_free(inc->comment, TRUE);
 
-	if (inc->termination)
-		g_free(inc->termination);
-
-	if (inc->sample_buffer)
-		g_free(inc->sample_buffer);
+	g_free(inc->termination);
+	g_free(inc->sample_buffer);
 }
 
 static struct sr_option options[] = {