diff --git a/site_ansto/counterdriv.c b/site_ansto/counterdriv.c index 884e0617..ccbfd79e 100644 --- a/site_ansto/counterdriv.c +++ b/site_ansto/counterdriv.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include "fortify.h" @@ -82,7 +83,7 @@ static void flog(char flag, char* format, ...) { if (file) { struct timeval tv; (void) gettimeofday(&tv, NULL); - fprintf(file, "%02d:%02d:%02d:%06d::%c::", + fprintf(file, "%02ld:%02ld:%02ld:%06ld::%c::", tv.tv_sec % (24 * 3600) / 3600, tv.tv_sec % (3600) / 60, tv.tv_sec % 60, @@ -250,7 +251,6 @@ static int MonWrite(pBeamMon self, char* text) { status = writeRS232(self->controller, text, (int) len); if (status != 1) { - char str[80]; flog('#', "MonWrite status = %d, errno = %d\n", status, errno); self->errorCode = status; if (status == BADSEND && errno == EPIPE) @@ -270,8 +270,6 @@ static int MonWrite(pBeamMon self, char* text) { */ static int MonRead(pBeamMon self, /*@out@*/ char* text, int *pLen) { int i, status, retries=2; - char str[80]; - char buf[1]; *text = '\0'; for (i = 0; i <= retries; i++) { @@ -388,7 +386,6 @@ static void HandleReport(CounterDriver *cntrData, BUFFER* bp) BeamMon* self = NULL; char *cp = NULL; char *ep = NULL; - char str[100]; self = (BeamMon *) cntrData->pData; /* TODO better than this */ cp = &bp->body[26]; @@ -699,7 +696,6 @@ static int MonReadValues(CounterDriver *cntrData) { */ static int MonGetError(CounterDriver *cntrData, int *iCode, char *error, int iErrLen) { BeamMon *self = NULL; - char str[40]; self = (BeamMon *) cntrData->pData; /* Allocate iErrLen bytes for error messages */