epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom: Replaced errlogRemoveListener()

Browse Source 
New version errlogRemoveListeners() is safer.
This commit is contained in:
Andrew Johnson
2013-06-28 12:35:43 -05:00
parent ec9568d096
commit c96db4c877
4 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libCom/error/errlog.c
View File

@@ -331,11 +331,12 @@ epicsShareFunc void epicsShareAPI errlogAddListener(
ellAdd(&pvtData.listenerList,&plistenerNode->node);
epicsMutexUnlock(pvtData.listenerLock);
}
epicsShareFunc void epicsShareAPI errlogRemoveListener(
errlogListener listener)
epicsShareFunc int epicsShareAPI errlogRemoveListeners(
errlogListener listener, void *pPrivate)
{
listenerNode *plistenerNode;
int count = 0;
errlogInit(0);
if (!pvtData.atExit)
@@ -343,21 +344,25 @@ epicsShareFunc void epicsShareAPI errlogRemoveListener(
plistenerNode = (listenerNode *)ellFirst(&pvtData.listenerList);
while (plistenerNode) {
if (plistenerNode->listener==listener) {
listenerNode *pnext = (listenerNode *)ellNext(&plistenerNode->node);
if (plistenerNode->listener == listener &&
plistenerNode->pPrivate == pPrivate) {
ellDelete(&pvtData.listenerList, &plistenerNode->node);
free((void *)plistenerNode);
break;
free(plistenerNode);
++count;
}
plistenerNode = (listenerNode *)ellNext(&plistenerNode->node);
plistenerNode = pnext;
}
if (!pvtData.atExit)
epicsMutexUnlock(pvtData.listenerLock);
if (!plistenerNode) {
if (count == 0) {
fprintf(pvtData.console,
"errlogRemoveListener did not find listener\n");
"errlogRemoveListeners: No listeners found\n");
}
return count;
}
epicsShareFunc int epicsShareAPI eltc(int yesno)

4
src/libCom/error/errlog.h
View File

@@ -57,8 +57,8 @@ epicsShareFunc errlogSevEnum epicsShareAPI errlogGetSevToLog(void);
epicsShareFunc void epicsShareAPI errlogAddListener(
errlogListener listener, void *pPrivate);
epicsShareFunc void epicsShareAPI errlogRemoveListener(
errlogListener listener);
epicsShareFunc int epicsShareAPI errlogRemoveListeners(
errlogListener listener, void *pPrivate);
epicsShareFunc int epicsShareAPI eltc(int yesno);
epicsShareFunc int errlogSetConsole(FILE *stream);