X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbeaglelogic%2Fbeaglelogic_tcp.c;h=e06a19a82a8b5a76df44af8c0085b98f07272e63;hb=584269fd2f44daa61497fb2cc9baa10a472577b0;hp=24355240ceb89569ddd2749e55110c5da77aa4c7;hpb=71f2000bfb01f69638883b1ec5540d82b11099e6;p=libsigrok.git

diff --git a/src/hardware/beaglelogic/beaglelogic_tcp.c b/src/hardware/beaglelogic/beaglelogic_tcp.c
index 24355240..e06a19a8 100644
--- a/src/hardware/beaglelogic/beaglelogic_tcp.c
+++ b/src/hardware/beaglelogic/beaglelogic_tcp.c
@@ -112,7 +112,7 @@ static int beaglelogic_tcp_send_cmd(struct dev_context *devc,
 	}
 
 	if (out < (int)strlen(buf)) {
-		sr_dbg("Only sent %d/%lu bytes of command: '%s'.", out,
+		sr_dbg("Only sent %d/%zu bytes of command: '%s'.", out,
 		       strlen(buf), buf);
 	}
 
@@ -172,6 +172,7 @@ static int beaglelogic_tcp_get_string(struct dev_context *devc, const char *cmd,
 	int len;
 	gint64 timeout;
 
+	*tcp_resp = NULL;
 	if (cmd) {
 		if (beaglelogic_tcp_send_cmd(devc, cmd) != SR_OK)
 			return SR_ERR;
@@ -271,7 +272,7 @@ static int beaglelogic_set_buffersize(struct dev_context *devc)
 	int ret;
 	char *resp;
 
-	beaglelogic_tcp_send_cmd(devc, "memalloc %lu", devc->buffersize);
+	beaglelogic_tcp_send_cmd(devc, "memalloc %" PRIu32, devc->buffersize);
 	ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
 	if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
 		ret = SR_OK;
@@ -288,9 +289,11 @@ static int beaglelogic_get_samplerate(struct dev_context *devc)
 	int arg, err;
 
 	err = beaglelogic_tcp_get_int(devc, "samplerate", &arg);
-	devc->cur_samplerate = arg;
+	if (err)
+		return err;
 
-	return err;
+	devc->cur_samplerate = arg;
+	return SR_OK;
 }
 
 static int beaglelogic_set_samplerate(struct dev_context *devc)
@@ -298,7 +301,7 @@ static int beaglelogic_set_samplerate(struct dev_context *devc)
 	int ret;
 	char *resp;
 
-	beaglelogic_tcp_send_cmd(devc, "samplerate %lu",
+	beaglelogic_tcp_send_cmd(devc, "samplerate %" PRIu32,
 		(uint32_t)devc->cur_samplerate);
 	ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
 	if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
@@ -322,7 +325,7 @@ static int beaglelogic_set_sampleunit(struct dev_context *devc)
 	int ret;
 	char *resp;
 
-	beaglelogic_tcp_send_cmd(devc, "sampleunit %lu", devc->sampleunit);
+	beaglelogic_tcp_send_cmd(devc, "sampleunit %" PRIu32, devc->sampleunit);
 	ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
 	if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
 		ret = SR_OK;
@@ -345,7 +348,7 @@ static int beaglelogic_set_triggerflags(struct dev_context *devc)
 	int ret;
 	char *resp;
 
-	beaglelogic_tcp_send_cmd(devc, "triggerflags %lu", devc->triggerflags);
+	beaglelogic_tcp_send_cmd(devc, "triggerflags %" PRIu32, devc->triggerflags);
 	ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
 	if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
 		ret = SR_OK;
@@ -387,7 +390,7 @@ static int beaglelogic_set_bufunitsize(struct dev_context *devc)
 	int ret;
 	char *resp;
 
-	beaglelogic_tcp_send_cmd(devc, "bufunitsize %ld", devc->bufunitsize);
+	beaglelogic_tcp_send_cmd(devc, "bufunitsize %" PRIu32, devc->bufunitsize);
 	ret = beaglelogic_tcp_get_string(devc, NULL, &resp);
 	if (ret == SR_OK && !g_ascii_strncasecmp(resp, "ok", 2))
 		ret = SR_OK;