Add rig_error2 for single-line debug message output

pull/1068/head
Mike Black W9MDB 2022-06-04 08:53:44 -05:00
rodzic fb86c8cf55
commit e84502b443
2 zmienionych plików z 18 dodań i 1 usunięć

Wyświetl plik

@ -3253,6 +3253,8 @@ rig_passband_wide HAMLIB_PARAMS((RIG *rig,
extern HAMLIB_EXPORT(const char *) extern HAMLIB_EXPORT(const char *)
rigerror HAMLIB_PARAMS((int errnum)); rigerror HAMLIB_PARAMS((int errnum));
extern HAMLIB_EXPORT(const char *)
rigerror2 HAMLIB_PARAMS((int errnum));
extern HAMLIB_EXPORT(int) extern HAMLIB_EXPORT(int)
rig_setting2idx HAMLIB_PARAMS((setting_t s)); rig_setting2idx HAMLIB_PARAMS((setting_t s));

Wyświetl plik

@ -390,6 +390,21 @@ void add2debugmsgsave(const char *s)
* *
* \todo support gettext/localization * \todo support gettext/localization
*/ */
const char *HAMLIB_API rigerror2(int errnum) // returns single-line message
{
errnum = abs(errnum);
if (errnum >= ERROR_TBL_SZ)
{
// This should not happen, but if it happens don't return NULL
return "ERR_OUT_OF_RANGE";
}
static char msg[DEBUGMSGSAVE_SIZE];
snprintf(msg, sizeof(msg), "%s\n", rigerror_table[errnum]);
return msg;
}
const char *HAMLIB_API rigerror(int errnum) const char *HAMLIB_API rigerror(int errnum)
{ {
errnum = abs(errnum); errnum = abs(errnum);
@ -795,7 +810,7 @@ int HAMLIB_API rig_open(RIG *rig)
rs->rigport.rig = rig; rs->rigport.rig = rig;
rs->rigport_deprecated.rig = rig; rs->rigport_deprecated.rig = rig;
if (strcmp(rs->rigport.pathname,"USB")==0) if (strcmp(rs->rigport.pathname, "USB") == 0)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: 'USB' is not a valid COM port name\n", __func__); rig_debug(RIG_DEBUG_ERR, "%s: 'USB' is not a valid COM port name\n", __func__);
errno = 2; errno = 2;