From 0d811963c1498aa625b5438bf66dbb677a0d4494 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 28 May 2015 17:06:18 +0100 Subject: fixup all the remaining logging macro callsites The semantic patch tool appears to have missed some difficult to reason about callsites which have now been manually cleaned up --- windows/schedule.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'windows/schedule.c') diff --git a/windows/schedule.c b/windows/schedule.c index 428aa227c..eb9ed3bc4 100644 --- a/windows/schedule.c +++ b/windows/schedule.c @@ -26,9 +26,9 @@ #include "windows/schedule.h" #ifdef DEBUG_SCHEDULER -#define SRLOG(x) LOG(x) +#define SRLOG(x...) LOG(x) #else -#define SRLOG(x) +#define SRLOG(x...) ((void) 0) #endif /* linked list of scheduled callbacks */ @@ -66,7 +66,7 @@ static nserror schedule_remove(void (*callback)(void *p), void *p) return NSERROR_OK; } - SRLOG(("removing %p, %p", callback, p)); + SRLOG("removing %p, %p", callback, p); cur_nscb = schedule_list; prev_nscb = NULL; @@ -76,8 +76,8 @@ static nserror schedule_remove(void (*callback)(void *p), void *p) (cur_nscb->p == p)) { /* item to remove */ - SRLOG(("callback entry %p removing %p(%p)", - cur_nscb, cur_nscb->callback, cur_nscb->p)); + SRLOG("callback entry %p removing %p(%p)", + cur_nscb, cur_nscb->callback, cur_nscb->p); /* remove callback */ unlnk_nscb = cur_nscb; @@ -118,8 +118,8 @@ nserror win32_schedule(int ival, void (*callback)(void *p), void *p) return NSERROR_NOMEM; } - SRLOG(("adding callback %p for %p(%p) at %d cs", - nscb, callback, p, ival)); + SRLOG("adding callback %p for %p(%p) at %d cs", + nscb, callback, p, ival); gettimeofday(&nscb->tv, NULL); timeradd(&nscb->tv, &tv, &nscb->tv); @@ -168,8 +168,8 @@ schedule_run(void) prev_nscb->next = unlnk_nscb->next; } - SRLOG(("callback entry %p running %p(%p)", - unlnk_nscb, unlnk_nscb->callback, unlnk_nscb->p)); + SRLOG("callback entry %p running %p(%p)", + unlnk_nscb, unlnk_nscb->callback, unlnk_nscb->p); /* call callback */ unlnk_nscb->callback(unlnk_nscb->p); @@ -201,8 +201,8 @@ schedule_run(void) /* make returned time relative to now */ timersub(&nexttime, &tv, &rettime); - SRLOG(("returning time to next event as %ldms", - (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000))); + SRLOG("returning time to next event as %ldms", + (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000)); /* return next event time in milliseconds (24days max wait) */ return (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000); -- cgit v1.2.3