From dd15b653570d00d3dbc26574f80063508a080576 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Wed, 16 Sep 1992 15:56:26 +0000
Subject: [PATCH] changed logMsg calls to errMessage

---
 src/db/callback.c | 10 ++++++----
 src/db/dbScan.c   | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/db/callback.c b/src/db/callback.c
index ffe19e6e9..a29b22256 100644
--- a/src/db/callback.c
+++ b/src/db/callback.c
@@ -76,18 +76,20 @@ void callbackRequest(CALLBACK *pcallback)
     static int status;
 
     if(priority<0 || priority>=(NUM_CALLBACK_PRIORITIES)) {
-	logMsg("callbackRequest called with invalid priority");
+	char msg[80];
+
+	sprintf(msg,"callbackRequest called with invalid priority=%d",priority);
+	errMessage(-1,msg);
 	return;
     }
     lockKey = intLock();
     nput = rngBufPut(callbackQ[priority],(void *)&pcallback,sizeof(pcallback));
     intUnlock(lockKey);
-    if(nput!=sizeof(pcallback)) logMsg("callbackRequest ring buffer full");
+    if(nput!=sizeof(pcallback)) errMessage(-1,"callbackRequest ring buffer full");
     if((status=semGive(callbackSem[priority]))!=OK) {
 /*semGive randomly returns garbage value*/
 /*
-		logMsg("semGive returned error in callbackRequest\n");
-logMsg("status=%d\n",status);
+		errMessage(-1,"semGive returned error in callbackRequest\n");
 */
     }
     return;
diff --git a/src/db/dbScan.c b/src/db/dbScan.c
index 64695f67f..8bf5c295b 100644
--- a/src/db/dbScan.c
+++ b/src/db/dbScan.c
@@ -138,18 +138,18 @@ void post_event(int event)
 
 	if (!interruptAccept) return;     /* not awake yet */
 	if(event<0 || event>=MAX_EVENTS) {
-		logMsg("illegal event passed to post_event\n");
+		errMessage(-1,"illegal event passed to post_event");
 		return;
 	}
 	evnt = (unsigned)event;
 	/*multiple writers can exist. Thus if evnt is ever changed to use*/
 	/*something bigger than a character interrupts will have to be blocked*/
 	if(rngBufPut(eventQ,(void *)&evnt,sizeof(unsigned char))!=sizeof(unsigned char))
-	    logMsg("rngBufPut overflow in post_event\n");
+	    errMessage(0,"rngBufPut overflow in post_event");
 	if((status=semGive(eventSem))!=OK){
 /*semGive randomly returns garbage value*/
 /*
-   		 logMsg("semGive returned error in post_event status= %d\n",status);
+   		 errMessage(0,"semGive returned error in post_event");
 */
         }
 }
@@ -428,18 +428,18 @@ got_record:
 	nPeriodic = scanChoices.no_str - SCAN_1ST_PERIODIC;
 	papPeriodic = calloc(nPeriodic,sizeof(struct scan_list));
 	if(papPeriodic==NULL) {
-		errMessage(-1,"initPeriodic calloc failure");
+		errMessage(0,"initPeriodic calloc failure");
 		exit(1);
 	}
 	periodicTaskId = calloc(nPeriodic,sizeof(int));
 	if(periodicTaskId==NULL) {
-		errMessage(-1,"initPeriodic calloc failure");
+		errMessage(0,"initPeriodic calloc failure");
 		exit(1);
 	}
 	for(i=0; i<nPeriodic; i++) {
 		psl = calloc(1,sizeof(struct scan_list));
 		if(psl==NULL) {
-			errMessage(-1,"initPeriodic calloc failure");
+			errMessage(0,"initPeriodic calloc failure");
 			exit(1);
 		}
 		papPeriodic[i] = psl;
@@ -479,10 +479,10 @@ static void eventTask()
 
     while(TRUE) {
         if(semTake(eventSem,WAIT_FOREVER)!=OK)
-	    logMsg("semTake returned error in eventTask\n");
+	    errMessage(0,"semTake returned error in eventTask");
         while (rngNBytes(eventQ)>=sizeof(unsigned char)){
 	    if(rngBufGet(eventQ,(void *)&event,sizeof(unsigned char))!=sizeof(unsigned char))
-		logMsg("rngBufGet returned error in eventTask\n");
+		errMessage(0,"rngBufGet returned error in eventTask");
 	    if(event<0 || event>MAX_EVENTS-1) {
 		errMessage(-1,"eventTask received an illegal event");
 		continue;
@@ -505,7 +505,7 @@ static void initEvent()
 		exit(1);
 	}
 	if((eventSem=semBCreate(SEM_Q_FIFO,SEM_EMPTY))==NULL)
-		logMsg("semBcreate failed in initEvent\n");
+		errMessage(0,"semBcreate failed in initEvent");
 }
 
 static void spawnEvent()
@@ -524,7 +524,7 @@ static void wdEvent()
     taskwdRemove(eventTaskId);
     if(!scanRestart) return;
     if(semFlush(eventSem)!=OK)
-	logMsg("semFlush failed while restarting eventTask\n");
+	errMessage(0,"semFlush failed while restarting eventTask");
     rngFlush(eventQ);
     for (i=0; i<MAX_EVENTS; i++) {
 	psl = papEvent[i];