From ea853a87ccfc42bd27f0d0181b9d29c4ea705a57 Mon Sep 17 00:00:00 2001 From: David Freese Date: Wed, 15 Oct 2014 17:56:19 -0500 Subject: [PATCH] flarq update * flarq changes to bring up to date with the 3.21 maintenance branch * version 4.3.5 --- configure.ac | 2 +- src/flarq-src/flarq.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 37da20a7..0395f2f5 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ m4_define(FLDIGI_MINOR, [22]) m4_define(FLDIGI_PATCH, [.00]) m4_define(FLARQ_MAJOR, [4]) m4_define(FLARQ_MINOR, [3]) -m4_define(FLARQ_PATCH, [.3]) +m4_define(FLARQ_PATCH, [.5]) AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[]FLDIGI_PATCH, [fldigi-devel@lists.berlios.de]) diff --git a/src/flarq-src/flarq.cxx b/src/flarq-src/flarq.cxx index a30db6b0..e0567b08 100644 --- a/src/flarq-src/flarq.cxx +++ b/src/flarq-src/flarq.cxx @@ -1109,7 +1109,7 @@ void payloadText(string s) sscanf(sizechars.c_str(), "%" PRIuSZ, &arqPayloadSize); rxARQhavesize = true; char statusmsg[40]; - snprintf(statusmsg, sizeof(statusmsg), "Rcvg: %d", + snprintf(statusmsg, sizeof(statusmsg), "Rcvg: %d", static_cast(arqPayloadSize)); txtStatus->value(statusmsg); } @@ -1260,7 +1260,7 @@ void sendEmailFile() txtsize = textin.length(); arqPayloadSize = txtsize; blocksSent = 0; - snprintf(sizemsg, sizeof(sizemsg), "ARQ:SIZE::%d\n", + snprintf(sizemsg, sizeof(sizemsg), "ARQ:SIZE::%d\n", static_cast(txtsize)); TX.append(sizemsg); TX.append(arqstart); @@ -1315,7 +1315,7 @@ void sendAsciiFile() txtsize = textin.length(); arqPayloadSize = txtsize; blocksSent = 0; - snprintf(sizemsg, sizeof(sizemsg), "ARQ:SIZE::%d\n", + snprintf(sizemsg, sizeof(sizemsg), "ARQ:SIZE::%d\n", static_cast(txtsize)); TX.append(sizemsg); TX.append(arqstart); @@ -1362,7 +1362,7 @@ void sendImageFile() textfile.close(); b64text = b64.encode(textin); b64size = b64text.length(); - snprintf(sizemsg, sizeof(sizemsg), "ARQ:SIZE::%d\n", + snprintf(sizemsg, sizeof(sizemsg), "ARQ:SIZE::%d\n", static_cast(b64size)); arqPayloadSize = b64size; blocksSent = 0; @@ -1411,7 +1411,7 @@ void sendBinaryFile() textfile.close(); b64text = b64.encode(textin); b64size = b64text.length(); - snprintf(sizemsg, sizeof(sizemsg), "ARQ:SIZE::%d\n", + snprintf(sizemsg, sizeof(sizemsg), "ARQ:SIZE::%d\n", static_cast(b64size)); arqPayloadSize = b64size; blocksSent = 0;