epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

error: add a constant for the minimum module number

Browse Source
This commit is contained in:
Emilio Perez
2023-03-09 09:10:08 +00:00
committed by Dirk Zimoch
parent 9555ca05b8
commit c680b9bebd
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/libcom/src/error/errMdef.h
View File

@@ -19,6 +19,7 @@
#define RTN_SUCCESS(STATUS) ((STATUS)==0)
/* Module numbers start above 500 for compatibility with vxWorks errnoLib */
#define MIN_MODULE_NUM 501
/* FIXME: M_xxx values could be declared as integer variables and set
* at runtime from registration routines; the S_xxx definitions would

13
modules/libcom/src/error/errSymLib.c
View File

@@ -80,7 +80,7 @@ static epicsUInt16 errhash(long errNum)
modnum = (unsigned short) (errNum >> 16);
errnum = (unsigned short) (errNum & 0xffff);
return (((modnum - 500) * 20) + errnum) % NHASH;
return ((modnum - (MIN_MODULE_NUM - 1)) * 20 + errnum) % NHASH;
}
/****************************************************************
@@ -94,7 +94,7 @@ int errSymbolAdd(long errNum, const char *name)
ERRNUMNODE *pNew = NULL;
int modnum = (epicsUInt16) (errNum >> 16);
if (modnum < 501)
if (modnum < MIN_MODULE_NUM)
return S_err_invCode;
epicsUInt16 hashInd = errhash(errNum);
@@ -154,7 +154,7 @@ const char* errSymLookupInternal(long status)
modNum = (unsigned) status;
modNum >>= 16;
modNum &= 0xffff;
if (modNum <= 500) {
if (modNum < MIN_MODULE_NUM) {
const char * pStr = strerror ((int) status);
if (pStr) {
return pStr;
@@ -244,9 +244,10 @@ void errSymTestPrint(long errNum)
message[0] = '\0';
modnum = (epicsUInt16) (errNum >> 16);
errnum = (epicsUInt16) (errNum & 0xffff);
if (modnum < 501) {
if (modnum < MIN_MODULE_NUM) {
fprintf(stderr, "Usage: errSymTestPrint(long errNum) \n");
fprintf(stderr, "errSymTestPrint: module number < 501 \n");
fprintf(stderr,
"errSymTestPrint: module number < %d\n", MIN_MODULE_NUM);
return;
}
errSymLookup(errNum, message, sizeof(message));
@@ -266,7 +267,7 @@ void errSymTest(epicsUInt16 modnum, epicsUInt16 begErrNum,
epicsUInt16 errnum;
if (!initialized) errSymBld();
if (modnum < 501)
if (modnum < MIN_MODULE_NUM)
return;
/* print range of error messages */