Fixed TestJoin README and javadoc

[tinyos-2.x.git] / tos / lib / tossim / sim_log.c

diff --git a/tos/lib/tossim/sim_log.c b/tos/lib/tossim/sim_log.c
index e17373053db452e7598cde921936eaae0a36b5a6..1334f41bee3363debf42838a031d6c19cd8048ca 100644 (file)
--- a/tos/lib/tossim/sim_log.c
+++ b/tos/lib/tossim/sim_log.c
@@ -1,6 +1,6 @@
 // $Id$
 
-/*                                                                     tab:4
+/*
 * "Copyright (c) 2005 Stanford University. All rights reserved.
  *
  * Permission to use, copy, modify, and distribute this software and
@@ -298,10 +298,10 @@ void sim_log_error_clear(uint16_t id, char* string, const char* format, ...) {
 static unsigned int sim_log_hash(void* key) {
   char* str = (char*)key;
   unsigned int hashVal = 0;
-  int c;
+  int hashChar;
   
-  while ((c = *str++))
-    hashVal = c + (hashVal << 6) + (hashVal << 16) - hashVal;
+  while ((hashChar = *str++))
+    hashVal = hashChar + (hashVal << 6) + (hashVal << 16) - hashVal;
   
   return hashVal;
 }