Remove warnings.

diff --git a/tos/lib/net/TrickleTimerImplP.nc b/tos/lib/net/TrickleTimerImplP.nc
index 1e61b46ede5499253be376da5e899339a5dd7bc1..68ffc4669263593dff6ecbd696620fe261e09929 100644 (file)
--- a/tos/lib/net/TrickleTimerImplP.nc
+++ b/tos/lib/net/TrickleTimerImplP.nc
@@ -208,24 +208,24 @@ implementation {
     // How much time has elapsed on the current timer
     // since it was scheduled? This value is needed because
     // the time remaining of a running timer is its time
-    // value minus tiem elapsed.
+    // value minus time elapsed.
     uint32_t elapsed = (call Timer.getNow() - call Timer.gett0());
        
     for (i = 0; i < count; i++) {
-      uint32_t time = trickles[i].time;
-      if (time != 0) {
+      uint32_t timeRemaining = trickles[i].time;
+      if (timeRemaining != 0) {
        atomic {
          if (!call Changed.get(i)) {
            call Changed.clear(i);
-           time -= elapsed;
+           timeRemaining -= elapsed;
          }
        }
        if (!set) {
-         lowest = time;
+         lowest = timeRemaining;
          set = TRUE;
        }
-       else if (time < lowest) {
-         lowest = time;
+       else if (timeRemaining < lowest) {
+         lowest = timeRemaining;
        }
       }
     }
@@ -244,7 +244,7 @@ implementation {
    * running (time != 0), then double the period.
    */
   void generateTime(uint8_t id) {
-    uint32_t time;
+    uint32_t newTime;
     uint16_t rval;
     
     if (trickles[id].time != 0) {
@@ -256,14 +256,14 @@ implementation {
     
     trickles[id].time = trickles[id].remainder;
     
-    time = trickles[id].period;
-    time = time << (scale - 1);
+    newTime = trickles[id].period;
+    newTime = newTime << (scale - 1);
 
     rval = call Random.rand16() % (trickles[id].period << (scale - 1));
-    time += rval;
+    newTime += rval;
     
-    trickles[id].remainder = (trickles[id].period << scale) - time;
-    trickles[id].time += time;
+    trickles[id].remainder = (trickles[id].period << scale) - newTime;
+    trickles[id].time += newTime;
     dbg("Trickle,TrickleTimes", "Generated time for %hhu with period %hu (%u) is %u (%i + %hu)\n", id, trickles[id].period, (uint32_t)trickles[id].period << scale, trickles[id].time, (trickles[id].period << (scale - 1)), rval);
   }