[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 1d23fb6358510aac550350088fcc90b8fc7c60ee

[Michael B. <mdb...@us...>]

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  1d23fb6358510aac550350088fcc90b8fc7c60ee (commit)
      from  fd0c8cba7c69edd86d6177d08ad73cd145177c30 (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 1d23fb6358510aac550350088fcc90b8fc7c60ee
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Mar 11 06:42:21 2021 -0600

    Fix some errors with the HAMLIB_ macro changes

diff --git a/extra/kylix/hamlib_rigapi.pas b/extra/kylix/hamlib_rigapi.pas
index 4a42bc2b..2007de8e 100644
--- a/extra/kylix/hamlib_rigapi.pas
+++ b/extra/kylix/hamlib_rigapi.pas
@@ -52,15 +52,15 @@ type
 //typedef struct rig RIG;
 
 const
-    RIGNAMSIZ = 30;
-    RIGVERSIZ = 8;
-    FILPATHLEN = 512;
-    FRQRANGESIZ = 30;
-    MAXCHANDESC = 30;		{* describe channel eg: "WWV 5Mhz" *}
-    TSLSTSIZ = 20;			{* max tuning step list size, zero ended *}
-    FLTLSTSIZ = 16;		    {* max mode/filter list size, zero ended *}
-    MAXDBLSTSIZ = 8;		{* max preamp/att levels supported, zero ended *}
-    CHANLSTSIZ = 16;		{* max mem_list size, zero ended *}
+    HAMLIB_RIGNAMSIZ = 30;
+    HAMLIB_RIGVERSIZ = 8;
+    HAMLIB_FILPATHLEN = 512;
+    HAMLIB_FRQRANGESIZ = 30;
+    HAMLIB_MAXCHANDESC = 30;		{* describe channel eg: "WWV 5Mhz" *}
+    HAMLIB_TSLSTSIZ = 20;			{* max tuning step list size, zero ended *}
+    HAMLIB_FLTLSTSIZ = 16;		    {* max mode/filter list size, zero ended *}
+    HAMLIB_MAXDBLSTSIZ = 8;		{* max preamp/att levels supported, zero ended *}
+    HAMLIB_CHANLSTSIZ = 16;		{* max mem_list size, zero ended *}
 
 type
     {*
diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index 9b28abd4..718233ef 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -380,7 +380,7 @@ static int netrigctl_open(RIG *rig)
 
 #if 0
     /* TODO */
-    chan_t chan_list[CHANLSTSIZ]; /*!< Channel list, zero ended */
+    chan_t chan_list[HAMLIB_CHANLSTSIZ]; /*!< Channel list, zero ended */
 #endif
 
     ret = read_string(&rig->state.rigport, buf, BUF_MAX, "\n", 1);
diff --git a/src/cal.c b/src/cal.c
index 8e1c3553..f9ba6912 100644
--- a/src/cal.c
+++ b/src/cal.c
@@ -63,7 +63,7 @@ float HAMLIB_API rig_raw2val(int rawval, const cal_table_t *cal)
     int i;
 
     /* ASSERT(cal != NULL) */
-    /* ASSERT(cal->size <= MAX_CAL_LENGTH) */
+    /* ASSERT(cal->size <= HAMLIB_MAX_CAL_LENGTH) */
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
@@ -130,7 +130,7 @@ float HAMLIB_API rig_raw2val_float(int rawval, const cal_table_float_t *cal)
     int i;
 
     /* ASSERT(cal != NULL) */
-    /* ASSERT(cal->size <= MAX_CAL_LENGTH) */
+    /* ASSERT(cal->size <= HAMLIB_MAX_CAL_LENGTH) */
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
diff --git a/tests/memload.c b/tests/memload.c
index ceeb5f31..4c0ed946 100644
--- a/tests/memload.c
+++ b/tests/memload.c
@@ -145,7 +145,7 @@ int set_chan(RIG *rig, channel_t *chan, xmlNodePtr node)
     n = chan->channel_num = atoi((char *) prop);
 
     /* find channel caps */
-    for (i = 0; i < CHANLSTSIZ ; i++)
+    for (i = 0; i < HAMLIB_CHANLSTSIZ ; i++)
     {
         if (rig->state.chan_list[i].startc <= n
                 && rig->state.chan_list[i].endc >= n)
@@ -155,7 +155,7 @@ int set_chan(RIG *rig, channel_t *chan, xmlNodePtr node)
         }
     }
 
-    if (i == CHANLSTSIZ) { return -RIG_EINVAL; }
+    if (i == HAMLIB_CHANLSTSIZ) { return -RIG_EINVAL; }
 
     fprintf(stderr, "node %d %d\n", n, i);
 
diff --git a/tests/rigmatrix.c b/tests/rigmatrix.c
index a8bb27fa..0075e978 100644
--- a/tests/rigmatrix.c
+++ b/tests/rigmatrix.c
@@ -422,7 +422,7 @@ static void draw_range(const freq_range_t range_list[],
 {
     int i;
 
-    for (i = 0; i < FRQRANGESIZ; i++)
+    for (i = 0; i < HAMLIB_FRQRANGESIZ; i++)
     {
         float start_pix, end_pix;
 

-----------------------------------------------------------------------

Summary of changes:
 extra/kylix/hamlib_rigapi.pas | 18 +++++++++---------
 rigs/dummy/netrigctl.c        |  2 +-
 src/cal.c                     |  4 ++--
 tests/memload.c               |  4 ++--
 tests/rigmatrix.c             |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries