From 11af4456c7d4cdd7f1149400b704d119c9986c7f Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Sat, 12 Aug 1995 01:10:25 +0000 Subject: [PATCH] dont return (and leak memory) --- src/libCom/errSymLib.c | 18 +++++++++++++----- src/libCom/error/errSymLib.c | 18 +++++++++++++----- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/libCom/errSymLib.c b/src/libCom/errSymLib.c index 7fedd258b..3f7d24849 100644 --- a/src/libCom/errSymLib.c +++ b/src/libCom/errSymLib.c @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -137,17 +138,21 @@ int errSymBld() unsigned short hashInd; if(initialized) return(0); - hashtable = (ERRNUMNODE**)dbCalloc(NHASH, sizeof(ERRNUMNODE*)); + hashtable = (ERRNUMNODE**)calloc(NHASH, sizeof(ERRNUMNODE*)); + if (!hashtable) { + return -1; + } for (i = 0; i < errSymTbl->nsymbols; i++, errArray++) { modnum = errArray->errNum >> 16; if (modnum < 501) { - printf("errSymBld: ERROR - Module number in errSymTbl < 501\n"); - return (-1); + printf("errSymBld: ERROR - Module number in errSymTbl < 501 was Module=%x Name=%s\n", + errArray->errNum, errArray->name); + continue; } if ((errSymbolAdd(errArray->errNum, errArray->name)) <0 ) { printf("errSymBld: ERROR - errSymbolAdd() failed \n"); - return (-1); + continue; } } perrNumNode = (ERRNUMNODE *) ellFirst(perrnumlist); @@ -206,7 +211,10 @@ char *name; ELLLIST *perrnumlist = &errnumlist; ERRNUMNODE *pNew; - pNew = (ERRNUMNODE*)dbCalloc(1, sizeof(ERRNUMNODE)); + pNew = (ERRNUMNODE*)calloc(1, sizeof(ERRNUMNODE)); + if (!pNew) { + return -1; + } pNew->errNum = errNum; pNew->message = name; ellAdd(perrnumlist,(ELLNODE*)pNew); diff --git a/src/libCom/error/errSymLib.c b/src/libCom/error/errSymLib.c index 7fedd258b..3f7d24849 100644 --- a/src/libCom/error/errSymLib.c +++ b/src/libCom/error/errSymLib.c @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -137,17 +138,21 @@ int errSymBld() unsigned short hashInd; if(initialized) return(0); - hashtable = (ERRNUMNODE**)dbCalloc(NHASH, sizeof(ERRNUMNODE*)); + hashtable = (ERRNUMNODE**)calloc(NHASH, sizeof(ERRNUMNODE*)); + if (!hashtable) { + return -1; + } for (i = 0; i < errSymTbl->nsymbols; i++, errArray++) { modnum = errArray->errNum >> 16; if (modnum < 501) { - printf("errSymBld: ERROR - Module number in errSymTbl < 501\n"); - return (-1); + printf("errSymBld: ERROR - Module number in errSymTbl < 501 was Module=%x Name=%s\n", + errArray->errNum, errArray->name); + continue; } if ((errSymbolAdd(errArray->errNum, errArray->name)) <0 ) { printf("errSymBld: ERROR - errSymbolAdd() failed \n"); - return (-1); + continue; } } perrNumNode = (ERRNUMNODE *) ellFirst(perrnumlist); @@ -206,7 +211,10 @@ char *name; ELLLIST *perrnumlist = &errnumlist; ERRNUMNODE *pNew; - pNew = (ERRNUMNODE*)dbCalloc(1, sizeof(ERRNUMNODE)); + pNew = (ERRNUMNODE*)calloc(1, sizeof(ERRNUMNODE)); + if (!pNew) { + return -1; + } pNew->errNum = errNum; pNew->message = name; ellAdd(perrnumlist,(ELLNODE*)pNew);