#1 printf format for dbg

[Anonymous]

RCS file: /cvsroot/tinyos/tinyos-1.x/tos/system/dbg.h,v
retrieving revision 1.1
diff -u -r1.1 dbg.h
--- dbg.h 6 Sep 2002 20:07:13 -0000 1.1
+++ dbg.h 30 Sep 2002 13:49:33 -0000
@@ -110,7 +110,7 @@
static void dbg_init(void);
static void dbg_help(void);

-static void dbg(TOS_dbg_mode mode, const char *format,
...)
+static void dbg(TOS_dbg_mode mode, const char *format,
...) __attribute__ ((format(printf,2,3)))
{
if (dbg_active(mode))
{
@@ -123,7 +123,7 @@
}
}

-static void dbg_clear(TOS_dbg_mode mode, const char
*format, ...)
+static void dbg_clear(TOS_dbg_mode mode, const char
*format, ...) __attribute__ ((format(printf,2,3)))
{
if (dbg_active(mode))
{

RCS file: /cvsroot/tinyos/tinyos-1.x/tos/system/TimerM.nc,v
retrieving revision 1.1
diff -u -r1.1 TimerM.nc
--- TimerM.nc 6 Sep 2002 20:07:13 -0000 1.1
+++ TimerM.nc 30 Sep 2002 13:48:46 -0000
@@ -232,7 +232,7 @@
}
mMinTimer=min_timer;
}
- dbg(DBG_CLOCK, "scaleDown %d levels min ticks=%d
id=%d\n", diff, mMinTicks, min_timer);
+ dbg(DBG_CLOCK, "scaleDown %d levels min ticks=%ld
id=%d\n", diff, mMinTicks, min_timer);

return (mClockRate-diff);
}
@@ -266,7 +266,7 @@
mTimerList[i].ticks<<=multiple;
}
mMinTicks<<=multiple;
- dbg(DBG_CLOCK, "multiple=%d min ticks=%d\n",
multiple, mMinTicks);
+ dbg(DBG_CLOCK, "multiple=%d min ticks=%ld\n",
multiple, mMinTicks);
}
else {
multiple = mClockRate- new_rate;
@@ -324,11 +324,11 @@
mTimerList[id].ticks = ticks ;
mTimerList[id].type = type;
mState|=(0x1<<id);
- dbg(DBG_CLOCK, "timer %d started rate=%d
ticks=%d\n", id, mClockRate, ticks);
+ dbg(DBG_CLOCK, "timer %d started rate=%d
ticks=%ld\n", id, mClockRate, ticks);
if (ticks <mMinTicks) {
mMinTicks=ticks;
mMinTimer=id;
- dbg(DBG_CLOCK,"minTicks=%d id=%d\n", ticks, id);
+ dbg(DBG_CLOCK,"minTicks=%ld id=%d\n", ticks, id);
}
return SUCCESS;
}