Mangle names of structure members to avoid clash with perl keywords.

pull/1846/head
George Baltz N3GB 2025-08-12 15:04:17 -04:00
rodzic 74558224a9
commit 0e36d4faa4
3 zmienionych plików z 11 dodań i 10 usunięć

Wyświetl plik

@ -1908,17 +1908,18 @@ struct rig_spectrum_line
/**
* Config item for deferred processing
* (Funky names to avoid clash with perl keywords. Sheesh.)
**/
struct deferred_config_item {
struct deferred_config_item *next;
struct deferred_config_item *nextt;
hamlib_token_t token;
char *value; // strdup'ed, must be freed
};
typedef struct deferred_config_item deferred_config_item_t;
struct deferred_config_header {
struct deferred_config_item *first; // NULL if none
struct deferred_config_item *last;
struct deferred_config_item *firstt; // NULL if none
struct deferred_config_item *lastt;
};
typedef struct deferred_config_header deferred_config_header_t;

Wyświetl plik

@ -3151,18 +3151,18 @@ int queue_deferred_config(deferred_config_header_t *head, hamlib_token_t token,
}
item->token = token;
item->next = NULL;
item->nextt = NULL;
if (!head->first)
if (!head->firstt)
{
head->first = item;
head->firstt = item;
}
else
{
head->last->next = item;
head->lastt->nextt = item;
}
head->last = item;
head->lastt = item;
return RIG_OK;
}

Wyświetl plik

@ -557,9 +557,9 @@ int HAMLIB_API rot_open(ROT *rot)
* Now that the rotator port is officially opened, we can
* send the deferred configuration info.
*/
while ((item = rs->config_queue.first))
while ((item = rs->config_queue.firstt))
{
rs->config_queue.first = item->next;
rs->config_queue.firstt = item->nextt;
status = rot_set_conf(rot, item->token, item->value);
free(item->value);
free(item);