Do not use strcmp() when we are going to get a RIG_PARM_* define anyway

pull/1845/head
Daniele Forsi IU5HKX 2025-08-13 17:27:06 +02:00
rodzic fb4d2c6455
commit b5b9e136a1
1 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -3717,7 +3717,9 @@ declare_proto_rig(set_parm)
RETURNFUNC2(RIG_OK); RETURNFUNC2(RIG_OK);
} }
if (strcmp(arg1, "BANDSELECT") == 0 && !strcmp(arg2, "?")) parm = rig_parse_parm(arg1);
if (parm == RIG_PARM_BANDSELECT && !strcmp(arg2, "?"))
{ {
char s[SPRINTF_MAX_SIZE]; char s[SPRINTF_MAX_SIZE];
rig_sprintf_parm_gran(s, sizeof(s) - 1, RIG_PARM_BANDSELECT, rig_sprintf_parm_gran(s, sizeof(s) - 1, RIG_PARM_BANDSELECT,
@ -3740,7 +3742,7 @@ declare_proto_rig(set_parm)
else { RETURNFUNC2(-RIG_EINTERNAL); } else { RETURNFUNC2(-RIG_EINTERNAL); }
} }
if (strcmp(arg1, "KEYERTYPE") == 0 && strcmp(arg2, "?") != 0) if (parm == RIG_PARM_KEYERTYPE && strcmp(arg2, "?") != 0)
{ {
if (strcmp(arg2, "STRAIGHT") == 0) {arg2 = "0";} if (strcmp(arg2, "STRAIGHT") == 0) {arg2 = "0";}
else if (strcmp(arg2, "BUG") == 0) {arg2 = "1";} else if (strcmp(arg2, "BUG") == 0) {arg2 = "1";}
@ -3748,8 +3750,6 @@ declare_proto_rig(set_parm)
else {RETURNFUNC2(-RIG_EINVAL)} else {RETURNFUNC2(-RIG_EINVAL)}
} }
parm = rig_parse_parm(arg1);
if (!rig_has_set_parm(rig, parm)) if (!rig_has_set_parm(rig, parm))
{ {
const struct confparams *cfp; const struct confparams *cfp;