Promote token_t to unsigned long long

https://github.com/Hamlib/Hamlib/issues/1402
pull/1404/head
Mike Black W9MDB 2023-10-19 23:35:20 -05:00
rodzic ec6c19854e
commit 01292b261f
6 zmienionych plików z 8 dodań i 8 usunięć

Wyświetl plik

@ -832,7 +832,7 @@ typedef enum {
/**
* \brief configuration token
*/
typedef long token_t;
typedef unsigned long long token_t;
//! @cond Doxygen_Suppress

Wyświetl plik

@ -4588,7 +4588,7 @@ int icom_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val)
int lvl_cn, lvl_sc; /* Command Number, Subcommand */
int i, retval;
rig_debug(RIG_DEBUG_VERBOSE, "%s called: token=%ld int=%d float=%f\n", __func__,
rig_debug(RIG_DEBUG_VERBOSE, "%s called: token=%lld int=%d float=%f\n", __func__,
token, val.i, val.f);
switch (token)
@ -4699,7 +4699,7 @@ int icom_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val)
else { i++; }
}
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_ext_level token: %ld\n", __func__,
rig_debug(RIG_DEBUG_ERR, "%s: unsupported set_ext_level token: %lld\n", __func__,
token);
RETURNFUNC2(-RIG_EINVAL);
}
@ -4806,7 +4806,7 @@ int icom_get_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t *val)
else { i++; }
}
rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_ext_level token: %ld\n", __func__,
rig_debug(RIG_DEBUG_ERR, "%s: unsupported get_ext_level token: %lld\n", __func__,
token);
RETURNFUNC(-RIG_EINVAL);
}

Wyświetl plik

@ -408,7 +408,7 @@ grbltrk_rot_set_conf(ROT *rot, token_t token, const char *val)
{
uint32_t resp_size, len;
rot_debug(RIG_DEBUG_ERR, "token: %ld; value: [%s]\n", token, val);
rot_debug(RIG_DEBUG_ERR, "token: %lld; value: [%s]\n", token, val);
len = strlen(val);

Wyświetl plik

@ -694,7 +694,7 @@ int HAMLIB_API amp_set_conf(AMP *amp, token_t token, const char *val)
{
const struct confparams *cfp;
char tokenstr[12];
SNPRINTF(tokenstr, sizeof(tokenstr), "%ld", token);
SNPRINTF(tokenstr, sizeof(tokenstr), "%lld", token);
cfp = amp_confparam_lookup(amp, tokenstr);
if (!cfp)

Wyświetl plik

@ -1287,7 +1287,7 @@ int HAMLIB_API rig_set_conf(RIG *rig, token_t token, const char *val)
{
const struct confparams *cfp;
char tokenstr[12];
SNPRINTF(tokenstr, sizeof(tokenstr), "%ld", token);
SNPRINTF(tokenstr, sizeof(tokenstr), "%lld", token);
cfp = rig_confparam_lookup(rig, tokenstr);
if (!cfp)

Wyświetl plik

@ -759,7 +759,7 @@ int HAMLIB_API rot_set_conf(ROT *rot, token_t token, const char *val)
{
const struct confparams *cfp;
char tokenstr[32];
SNPRINTF(tokenstr, sizeof(tokenstr), "%ld", token);
SNPRINTF(tokenstr, sizeof(tokenstr), "%lld", token);
cfp = rot_confparam_lookup(rot, tokenstr);
if (!cfp)