From 18c88c9f3859c3201eaac30e000a69e6d5e232c2 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Tue, 12 Dec 2023 22:49:25 -0600 Subject: [PATCH] Fix clang warnings https://github.com/Hamlib/Hamlib/issues/1450 --- security/sctest.c | 2 +- tests/hamlibmodels.c | 2 +- tests/listrigs.c | 2 +- tests/rigctld.c | 2 +- tests/testmW2power.c | 2 +- tests/testrig.c | 2 +- tests/testrigopen.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/security/sctest.c b/security/sctest.c index 4d1adf5bf..2c4e2b6fc 100644 --- a/security/sctest.c +++ b/security/sctest.c @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) */ strcpy(plaintext, pass_input); printf("Plaintext: %s\n", plaintext); - printf("Plaintext length: %ld\n", strlen(plaintext)); + printf("Plaintext length: %d\n", (int)strlen(plaintext)); /* * Encrypt the string diff --git a/tests/hamlibmodels.c b/tests/hamlibmodels.c index a7cfac7f0..0a5e21596 100644 --- a/tests/hamlibmodels.c +++ b/tests/hamlibmodels.c @@ -7,7 +7,7 @@ char *list[1000]; // as of 2023-01-17 we have 275 rigs so this should cover us f int nmodels = 0; -static int hash_model_list(const struct rig_caps *caps, void *data) +static int hash_model_list(struct rig_caps *caps, void *data) { char s[256]; sprintf(s, "%s %s", caps->mfg_name, caps->model_name); diff --git a/tests/listrigs.c b/tests/listrigs.c index 230b1c413..65300d25f 100644 --- a/tests/listrigs.c +++ b/tests/listrigs.c @@ -27,7 +27,7 @@ #include -int print_caps_sum(const struct rig_caps *caps, void *data) +int print_caps_sum(struct rig_caps *caps, void *data) { const char *fmt1 = "%-13s"; printf("%6u \t%-22s \t%-23s\t%-8s \t", diff --git a/tests/rigctld.c b/tests/rigctld.c index e82f18cff..ebdc2a2ab 100644 --- a/tests/rigctld.c +++ b/tests/rigctld.c @@ -867,7 +867,7 @@ int main(int argc, char *argv[]) freeaddrinfo(saved_result); /* No longer needed */ exit(2); } - int optval = 1; + const int optval = 1; #ifdef __MINGW32__ if (setsockopt(sock_listen, SOL_SOCKET, SO_REUSEADDR, (PCHAR)&optval, sizeof(optval)) < 0) #else diff --git a/tests/testmW2power.c b/tests/testmW2power.c index 9e910e95c..88c38b6ed 100644 --- a/tests/testmW2power.c +++ b/tests/testmW2power.c @@ -13,7 +13,7 @@ int nrigs = 0; -int callback(const struct rig_caps *caps, rig_ptr_t rigp) +int callback(struct rig_caps *caps, rig_ptr_t rigp) { RIG *rig = (RIG *) rigp; diff --git a/tests/testrig.c b/tests/testrig.c index 19701f49c..f4b3b46ea 100644 --- a/tests/testrig.c +++ b/tests/testrig.c @@ -78,7 +78,7 @@ int main(int argc, const char *argv[]) } uint64_t levels = rig_get_caps_int(my_rig->caps->rig_model, RIG_CAPS_HAS_GET_LEVEL); - printf("HAS_GET_LEVEL=0x%8lx, SWR=%8llx,true=%d\n", levels, levels & RIG_LEVEL_SWR, (levels & RIG_LEVEL_SWR) == RIG_LEVEL_SWR); + printf("HAS_GET_LEVEL=0x%8llx, SWR=%8llx,true=%d\n", levels, levels & RIG_LEVEL_SWR, (levels & RIG_LEVEL_SWR) == RIG_LEVEL_SWR); char val[256]; retcode = rig_get_conf2(my_rig, rig_token_lookup(my_rig, "write_delay"), val, diff --git a/tests/testrigopen.c b/tests/testrigopen.c index 18b8e13ed..76d535332 100644 --- a/tests/testrigopen.c +++ b/tests/testrigopen.c @@ -16,7 +16,7 @@ #define SERIAL_PORT "/dev/ttyUSB0" -int callback(const struct rig_caps *caps, rig_ptr_t rigp) +int callback(struct rig_caps *caps, rig_ptr_t rigp) { RIG *rig = (RIG *) rigp;