Update dcdport usage in tests/*.c

Issue #1445
pull/1508/head
George Baltz N3GB 2024-01-19 15:44:34 -05:00
rodzic 1532a7d8dc
commit b1d85e5aa1
5 zmienionych plików z 16 dodań i 10 usunięć

Wyświetl plik

@ -23,6 +23,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
*/ */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <hamlib/config.h> #include <hamlib/config.h>
#include <stdio.h> #include <stdio.h>
@ -603,7 +605,7 @@ int main(int argc, char *argv[])
if (dcd_type != RIG_DCD_NONE) if (dcd_type != RIG_DCD_NONE)
{ {
my_rig->state.dcdport.type.dcd = dcd_type; DCDPORT(my_rig)->type.dcd = dcd_type;
} }
if (ptt_file) if (ptt_file)
@ -613,7 +615,7 @@ int main(int argc, char *argv[])
if (dcd_file) if (dcd_file)
{ {
strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1); strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
} }
/* FIXME: bound checking and port type == serial */ /* FIXME: bound checking and port type == serial */

Wyświetl plik

@ -26,6 +26,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
*/ */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <hamlib/config.h> #include <hamlib/config.h>
@ -530,7 +531,7 @@ int main(int argc, char *argv[])
if (dcd_type != RIG_DCD_NONE) if (dcd_type != RIG_DCD_NONE)
{ {
my_rig->state.dcdport.type.dcd = dcd_type; DCDPORT(my_rig)->type.dcd = dcd_type;
} }
if (ptt_file) if (ptt_file)
@ -540,7 +541,7 @@ int main(int argc, char *argv[])
if (dcd_file) if (dcd_file)
{ {
strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1); strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
} }
/* FIXME: bound checking and port type == serial */ /* FIXME: bound checking and port type == serial */

Wyświetl plik

@ -22,6 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
*/ */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <hamlib/config.h> #include <hamlib/config.h>
@ -714,7 +715,7 @@ int main(int argc, char *argv[])
if (dcd_type != RIG_DCD_NONE) if (dcd_type != RIG_DCD_NONE)
{ {
my_rig->state.dcdport.type.dcd = dcd_type; DCDPORT(my_rig)->type.dcd = dcd_type;
my_rig->state.dcdport_deprecated.type.dcd = dcd_type; my_rig->state.dcdport_deprecated.type.dcd = dcd_type;
} }
@ -727,7 +728,7 @@ int main(int argc, char *argv[])
if (dcd_file) if (dcd_file)
{ {
strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1); strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
strncpy(my_rig->state.dcdport_deprecated.pathname, dcd_file, strncpy(my_rig->state.dcdport_deprecated.pathname, dcd_file,
HAMLIB_FILPATHLEN - 1); HAMLIB_FILPATHLEN - 1);
} }

Wyświetl plik

@ -23,6 +23,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
*/ */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <hamlib/config.h> #include <hamlib/config.h>
@ -557,7 +558,7 @@ int main(int argc, char *argv[])
if (dcd_type != RIG_DCD_NONE) if (dcd_type != RIG_DCD_NONE)
{ {
my_rig->state.dcdport.type.dcd = dcd_type; DCDPORT(my_rig)->type.dcd = dcd_type;
} }
if (ptt_file) if (ptt_file)
@ -567,7 +568,7 @@ int main(int argc, char *argv[])
if (dcd_file) if (dcd_file)
{ {
strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1); strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
} }
#endif #endif

Wyświetl plik

@ -22,6 +22,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
*/ */
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <hamlib/config.h> #include <hamlib/config.h>
@ -709,7 +710,7 @@ int main(int argc, char *argv[])
if (dcd_type != RIG_DCD_NONE) if (dcd_type != RIG_DCD_NONE)
{ {
my_rig->state.dcdport.type.dcd = dcd_type; DCDPORT(my_rig)->type.dcd = dcd_type;
my_rig->state.dcdport_deprecated.type.dcd = dcd_type; my_rig->state.dcdport_deprecated.type.dcd = dcd_type;
} }
@ -722,7 +723,7 @@ int main(int argc, char *argv[])
if (dcd_file) if (dcd_file)
{ {
strncpy(my_rig->state.dcdport.pathname, dcd_file, HAMLIB_FILPATHLEN - 1); strncpy(DCDPORT(my_rig)->pathname, dcd_file, HAMLIB_FILPATHLEN - 1);
strncpy(my_rig->state.dcdport_deprecated.pathname, dcd_file, strncpy(my_rig->state.dcdport_deprecated.pathname, dcd_file,
HAMLIB_FILPATHLEN - 1); HAMLIB_FILPATHLEN - 1);
} }