* flarq changes to bring up to date with the 3.21 maintenance
    branch
  * version 4.3.5
pull/1/head
David Freese 2014-10-15 17:56:19 -05:00
rodzic 26892a2afe
commit ea853a87cc
2 zmienionych plików z 6 dodań i 6 usunięć

Wyświetl plik

@ -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])

Wyświetl plik

@ -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<int>(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<int>(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<int>(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<int>(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<int>(b64size));
arqPayloadSize = b64size;
blocksSent = 0;