From 94b3852f17da579c6ae07b1b03908e17f45f5898 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Tue, 7 Dec 1999 20:33:08 +0000
Subject: [PATCH] fixed compiler warnings

---
 src/libCom/error/errlog.c        | 9 +++++----
 src/libCom/logClient/logClient.c | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/libCom/error/errlog.c b/src/libCom/error/errlog.c
index 0f6ade9df..bf7da4075 100644
--- a/src/libCom/error/errlog.c
+++ b/src/libCom/error/errlog.c
@@ -32,6 +32,7 @@ of this distribution.
 #include "error.h"
 #include "ellLib.h"
 #include "errlog.h"
+#include "logClient.h"
 
 
 #ifndef LOCAL
@@ -268,10 +269,11 @@ epicsShareFunc void epicsShareAPIV errPrintf(long status, const char *pFileName,
 
 	rtnval = errSymFind(status,name);
 	if(rtnval) {
-	    unsigned short	modnum,errnum;
+	    unsigned modnum, errnum;
 
-	    modnum = status >> 16; errnum = status & 0xffff;
-	    nchar = sprintf(pnext, "status (%hu,%hu) not in symbol table ",
+	    modnum = (unsigned) ((status >> 16) & 0xffff); 
+        errnum = (unsigned) (status & 0xffff);
+	    nchar = sprintf(pnext, "status (%u,%u) not in symbol table ",
 		 modnum, errnum);
 	} else {
 	    nchar = sprintf(pnext,"%s ",name);
@@ -311,7 +313,6 @@ epicsShareFunc int epicsShareAPI errlogInit(int bufsize)
     threadCreate("errlog",threadPriorityLow,
         threadGetStackSize(threadStackSmall),
         (THREADFUNC)errlogTask,0);
-    /*For now make sure iocLogInit is called*/
     iocLogInit();
 
     return(0);
diff --git a/src/libCom/logClient/logClient.c b/src/libCom/logClient/logClient.c
index 609f7ca1e..dd84d8b35 100644
--- a/src/libCom/logClient/logClient.c
+++ b/src/libCom/logClient/logClient.c
@@ -184,6 +184,7 @@ void logClientReset (logClient *pClient)
 /*
  * logClientDestroy
  */
+#   ifndef vxWorks
 LOCAL void logClientDestroy (logClient *pClient)
 {
     /*
@@ -197,6 +198,7 @@ LOCAL void logClientDestroy (logClient *pClient)
 
     free (pClient);
 }
+#endif
 
 /*
  * logClientShutdown()
@@ -547,7 +549,6 @@ epicsShareFunc logClientId epicsShareAPI logClientInit ()
     static const unsigned maxConnectTries = 40u;
     static const unsigned microSecDelay = 50000u;
     static const unsigned secDelay = 0u;
-    static const double uSecPerSec = 1000000.0;
     unsigned connectTries = 0;
     logClient *pClient;
     logClientId id;