[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. c2cab5465071ccecd6ac5
Library to control radio transceivers and receivers
Brought to you by:
n0nb
From: Michael B. <mdb...@us...> - 2021-03-09 16:17:17
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Hamlib -- Ham radio control libraries". The branch, master has been updated via c2cab5465071ccecd6ac568fbb472eade9fa721a (commit) via 8a2a51b2214d4e39517ff48c418b06716cc85c6e (commit) from 0148fd70007ac079e776cb6142eca7ec04efc3e8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c2cab5465071ccecd6ac568fbb472eade9fa721a Author: Michael Black W9MDB <mdb...@ya...> Date: Tue Mar 9 10:16:18 2021 -0600 Change all FILPATHLEN names to HAMLIB_FILPATHLEN diff --git a/tests/cachetest.c b/tests/cachetest.c index 07eb1c9b..6e5f10a1 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 db427cbb..60cbd049 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 ca29a0a6..24ffe802 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 251dbc5d..c784c369 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 ca2ebd88..d9b95e6a 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 b7b9ab97..4c10582e 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 5e96a0b5..7b0046e2 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)) { commit 8a2a51b2214d4e39517ff48c418b06716cc85c6e Author: Michael Black W9MDB <mdb...@ya...> Date: Tue Mar 9 10:09:22 2021 -0600 Possible fix for MacOS python2 binding build https://github.com/Hamlib/Hamlib/issues/477 diff --git a/bindings/Makefile.am b/bindings/Makefile.am index 5e4f81f7..a381d0bf 100644 --- a/bindings/Makefile.am +++ b/bindings/Makefile.am @@ -121,7 +121,7 @@ check-py: all-py Hamlib.py: hamlibpy_wrap.c hamlibpy_wrap.c: hamlib.swg $(SWGDEP) - $(AM_V_GEN)$(SWIG) -python $(AM_CPPFLAGS) -I$(top_srcdir)/bindings \ + $(AM_V_GEN)$(SWIG) -python $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) -I$(top_srcdir)/bindings \ -o $@ $$(test -f hamlib.swg || echo '$(srcdir)/')hamlib.swg install-py: ----------------------------------------------------------------------- Summary of changes: bindings/Makefile.am | 2 +- 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 +- 8 files changed, 10 insertions(+), 10 deletions(-) hooks/post-receive -- Hamlib -- Ham radio control libraries |