From e668ae9fc6bd1fe7cd3ef6deb6a89ccb3e63d0b6 Mon Sep 17 00:00:00 2001 From: Tom Early Date: Mon, 7 Mar 2022 06:10:07 -0700 Subject: [PATCH] can't use NULL as a null character anymore --- QnetDVAP.cpp | 10 +++++----- QnetDVRPTR.cpp | 8 ++++---- QnetITAP.cpp | 8 ++++---- QnetModem.cpp | 8 ++++---- QnetRelay.cpp | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/QnetDVAP.cpp b/QnetDVAP.cpp index 186ad0b..46aa834 100644 --- a/QnetDVAP.cpp +++ b/QnetDVAP.cpp @@ -49,7 +49,7 @@ #include "DStarDecode.h" #include "QnetDVAP.h" -#define DVAP_VERSION "QnetDVAP-220429" +#define DVAP_VERSION "QnetDVAP-20307" #define CALL_SIZE 8 #define IP_SIZE 15 @@ -966,7 +966,7 @@ void CQnetDVAP::Run() int main(int argc, char *argv[]) { setvbuf(stdout, NULL, _IOLBF, 0); - printf("dvap_rptr VERSION %s\n", DVAP_VERSION); + printf("%s\n", DVAP_VERSION); if (argc != 2) { @@ -976,9 +976,9 @@ int main(int argc, char *argv[]) if ('-' == argv[1][0]) { - printf("\nQnetDVAP Version #%s Copyright (C) 2018-2020 by Thomas A. Early N7TAE\n", DVAP_VERSION); + printf("%s Copyright (C) 2018-2020 by Thomas A. Early N7TAE\n", DVAP_VERSION); printf("QnetDVAP comes with ABSOLUTELY NO WARRANTY; see the LICENSE for details.\n"); - printf("This is free software, and you are welcome to distribute it\nunder certain conditions that are discussed in the LICENSE file.\n\n"); + printf("This is free software, and you are welcome to distribute it\nunder certain conditions that are discussed in the LICENSE file.\nS"); return EXIT_SUCCESS; } @@ -993,7 +993,7 @@ int main(int argc, char *argv[]) int mod; switch (*qn) { - case NULL: + case 0: mod = -1; break; case 'a': diff --git a/QnetDVRPTR.cpp b/QnetDVRPTR.cpp index d9205dc..35a81d1 100644 --- a/QnetDVRPTR.cpp +++ b/QnetDVRPTR.cpp @@ -40,7 +40,7 @@ #include "DStarDecode.h" #include "QnetDVRPTR.h" -#define DVRPTR_VERSION "QnetDVRPTR-526" +#define DVRPTR_VERSION "QnetDVRPTR-20307" #define BAUD B115200 #define IP_SIZE 15 @@ -1993,9 +1993,9 @@ int main(int argc, const char **argv) if ('-' == argv[1][0]) { - printf("\nQnetDVRPTR Version #%s Copyright (C) 2018-2019 by Thomas A. Early N7TAE\n", DVRPTR_VERSION); + printf("%s Copyright (C) 2018-2019 by Thomas A. Early N7TAE\n", DVRPTR_VERSION); printf("QnetDVRPTR comes with ABSOLUTELY NO WARRANTY; see the LICENSE for details.\n"); - printf("This is free software, and you are welcome to distribute it\nunder certain conditions that are discussed in the LICENSE file.\n\n"); + printf("This is free software, and you are welcome to distribute it\nunder certain conditions that are discussed in the LICENSE file.\n"); return 0; } @@ -2010,7 +2010,7 @@ int main(int argc, const char **argv) int mod; switch (*qn) { - case NULL: + case 0: mod = -1; break; case 'a': diff --git a/QnetITAP.cpp b/QnetITAP.cpp index 53ac25f..eafebbc 100644 --- a/QnetITAP.cpp +++ b/QnetITAP.cpp @@ -45,7 +45,7 @@ #include "QnetConfigure.h" #include "Timer.h" -#define ITAP_VERSION "QnetITAP-825" +#define ITAP_VERSION "QnetITAP-20307" CQnetITAP::CQnetITAP(int mod) : assigned_module(mod) @@ -744,9 +744,9 @@ int main(int argc, const char **argv) if ('-' == argv[1][0]) { - printf("\nQnetITAP Version #%s Copyright (C) 2018-2019 by Thomas A. Early N7TAE\n", ITAP_VERSION); + printf("%s Copyright (C) 2018-2019 by Thomas A. Early N7TAE\n", ITAP_VERSION); printf("QnetITAP comes with ABSOLUTELY NO WARRANTY; see the LICENSE for details.\n"); - printf("This is free software, and you are welcome to distribute it\nunder certain conditions that are discussed in the LICENSE file.\n\n"); + printf("This is free software, and you are welcome to distribute it\nunder certain conditions that are discussed in the LICENSE file.\n"); return 0; } @@ -761,7 +761,7 @@ int main(int argc, const char **argv) int assigned_module; switch (*qn) { - case NULL: + case 0: assigned_module = -1; break; case 'a': diff --git a/QnetModem.cpp b/QnetModem.cpp index 8adf848..55a1cc1 100644 --- a/QnetModem.cpp +++ b/QnetModem.cpp @@ -44,7 +44,7 @@ #include "QnetModem.h" #include "QnetConfigure.h" -#define MODEM_VERSION "QnetModem-708" +#define MODEM_VERSION "QnetModem-20307" #define MAX_RESPONSES 30 const unsigned char FRAME_START = 0xE0U; @@ -944,10 +944,10 @@ int main(int argc, const char **argv) if ('-' == argv[1][0]) { - printf("\nQnetModem Version %s Copyright (C) 2019 by Thomas A. Early N7TAE\n", MODEM_VERSION); + printf("%s Copyright (C) 2019 by Thomas A. Early N7TAE\n", MODEM_VERSION); printf("QnetModem comes with ABSOLUTELY NO WARRANTY; see the LICENSE for details.\n"); printf("This is free software, and you are welcome to distribute it\n"); - printf("under certain conditions that are discussed in the LICENSE file.\n\n"); + printf("under certain conditions that are discussed in the LICENSE file.\n"); return 0; } @@ -962,7 +962,7 @@ int main(int argc, const char **argv) int assigned_module; switch (*qn) { - case NULL: + case 0: assigned_module = -1; break; case 'a': diff --git a/QnetRelay.cpp b/QnetRelay.cpp index 102a9d0..09cf801 100644 --- a/QnetRelay.cpp +++ b/QnetRelay.cpp @@ -36,7 +36,7 @@ #include "QnetTypeDefs.h" #include "QnetConfigure.h" -#define RELAY_VERSION "210420" +#define RELAY_VERSION "QnetRelay-20307" CQnetRelay::CQnetRelay(int mod) : assigned_module(mod), @@ -453,9 +453,9 @@ int main(int argc, const char **argv) if ('-' == argv[1][0]) { - printf("\nQnetRelay Version #%s Copyright (C) 2018-2021 by Thomas A. Early N7TAE\n", RELAY_VERSION); + printf("%s Copyright (C) 2018-2021 by Thomas A. Early N7TAE\n", RELAY_VERSION); printf("QnetRelay comes with ABSOLUTELY NO WARRANTY; see the LICENSE for details.\n"); - printf("This is free software, and you are welcome to distribute it\nunder certain conditions that are discussed in the LICENSE file.\n\n"); + printf("This is free software, and you are welcome to distribute it\nunder certain conditions that are discussed in the LICENSE file.\n"); return 0; } @@ -469,7 +469,7 @@ int main(int argc, const char **argv) int module; switch (*qn) { - case NULL: + case 0: module = -1; break; case 'a':