From c2cab5465071ccecd6ac568fbb472eade9fa721a Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Tue, 9 Mar 2021 10:16:18 -0600 Subject: [PATCH] Change all FILPATHLEN names to HAMLIB_FILPATHLEN --- tests/cachetest.c | 2 +- tests/cachetest2.c | 2 +- tests/dumpmem.c | 2 +- tests/example.c | 2 +- tests/rig_bench.c | 4 ++-- tests/testrig.c | 4 ++-- tests/testtrn.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/cachetest.c b/tests/cachetest.c index 07eb1c9b3..6e5f10a13 100644 --- a/tests/cachetest.c +++ b/tests/cachetest.c @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) /* Set up serial port, baud rate */ rig_file = argv[2]; // your serial device - strncpy(my_rig->state.rigport.pathname, rig_file, FILPATHLEN - 1); + strncpy(my_rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1); my_rig->state.rigport.parm.serial.rate = baud; // your baud rate diff --git a/tests/cachetest2.c b/tests/cachetest2.c index db427cbb2..60cbd0490 100644 --- a/tests/cachetest2.c +++ b/tests/cachetest2.c @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) /* Set up serial port, baud rate */ rig_file = "127.0.0.1:4532"; // your serial device - strncpy(my_rig->state.rigport.pathname, rig_file, FILPATHLEN - 1); + strncpy(my_rig->state.rigport.pathname, rig_file, HAMLIB_FILPATHLEN - 1); /* Open my rig */ retcode = rig_open(my_rig); diff --git a/tests/dumpmem.c b/tests/dumpmem.c index ca29a0a60..24ffe802f 100644 --- a/tests/dumpmem.c +++ b/tests/dumpmem.c @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) exit(1); /* whoops! something went wrong (mem alloc?) */ } - strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, FILPATHLEN - 1); + strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, HAMLIB_FILPATHLEN - 1); if (rig_open(my_rig)) { diff --git a/tests/example.c b/tests/example.c index 251dbc5d7..c784c3698 100644 --- a/tests/example.c +++ b/tests/example.c @@ -43,7 +43,7 @@ int main() /* Instantiate a rig */ my_rig = rig_init(MODEL); // your rig model. - strncpy(my_rig->state.rigport.pathname, PATH, FILPATHLEN - 1); + strncpy(my_rig->state.rigport.pathname, PATH, HAMLIB_FILPATHLEN - 1); my_rig->state.rigport.parm.serial.rate = BAUD; // your baud rate diff --git a/tests/rig_bench.c b/tests/rig_bench.c index ca2ebd885..d9b95e6ae 100644 --- a/tests/rig_bench.c +++ b/tests/rig_bench.c @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) myport.parm.serial.stop_bits = 1; myport.parm.serial.parity = RIG_PARITY_NONE; myport.parm.serial.handshake = RIG_HANDSHAKE_NONE; - strncpy(myport.pathname, SERIAL_PORT, FILPATHLEN - 1); + strncpy(myport.pathname, SERIAL_PORT, HAMLIB_FILPATHLEN - 1); rig_load_all_backends(); myrig_model = rig_probe(&myport); @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) printf("Serial speed: %d bauds\n", my_rig->state.rigport.parm.serial.rate); - strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, FILPATHLEN - 1); + strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, HAMLIB_FILPATHLEN - 1); retcode = rig_open(my_rig); diff --git a/tests/testrig.c b/tests/testrig.c index b7b9ab972..4c10582ed 100644 --- a/tests/testrig.c +++ b/tests/testrig.c @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) myport.parm.serial.stop_bits = 1; myport.parm.serial.parity = RIG_PARITY_NONE; myport.parm.serial.handshake = RIG_HANDSHAKE_NONE; - strncpy(myport.pathname, SERIAL_PORT, FILPATHLEN - 1); + strncpy(myport.pathname, SERIAL_PORT, HAMLIB_FILPATHLEN - 1); rig_load_all_backends(); myrig_model = rig_probe(&myport); @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) exit(1); /* whoops! something went wrong (mem alloc?) */ } - strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, FILPATHLEN - 1); + strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, HAMLIB_FILPATHLEN - 1); retcode = rig_open(my_rig); diff --git a/tests/testtrn.c b/tests/testtrn.c index 5e96a0b5e..7b0046e24 100644 --- a/tests/testtrn.c +++ b/tests/testtrn.c @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) exit(1); /* whoops! something went wrong (mem alloc?) */ } - strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, FILPATHLEN - 1); + strncpy(my_rig->state.rigport.pathname, SERIAL_PORT, HAMLIB_FILPATHLEN - 1); if (rig_open(my_rig)) {