Sfoglia il codice sorgente

- warning message fixed (integer overflow)
- added set_msg_id_val

Andrei Pelinescu-Onciul 20 anni fa
parent
commit
0aa3fcd6b5
2 ha cambiato i file con 11 aggiunte e 4 eliminazioni
  1. 5 4
      timer.c
  2. 6 0
      ut.h

+ 5 - 4
timer.c

@@ -402,10 +402,11 @@ inline static void adjust_ticks()
 			delta=(s_ticks_t)(diff_time_ticks-diff_ticks_raw);
 			if (delta<-1){
 				LOG(L_WARN, "WARNING: our timer runs faster then real-time"
-						" (%u ms / %u ticks our time .->"
-						 " %ld ms / %u ticks real time)\n", 
-						diff_ticks_raw*1000/TIMER_TICKS_HZ, diff_ticks_raw,
-						(long)(diff_time/1000), diff_time_ticks);
+						" (%lu ms / %u ticks our time .->"
+						 " %lu ms / %u ticks real time)\n", 
+						(unsigned long)(diff_ticks_raw*1000L/TIMER_TICKS_HZ),
+						diff_ticks_raw,
+						(unsigned long)(diff_time/1000), diff_time_ticks);
 				last_time=crt_time;
 				last_ticks=*ticks;
 			}else{

+ 6 - 0
ut.h

@@ -107,6 +107,12 @@ struct msgid_var{
 #define get_msgid_val(var, id, type)\
 	(type)((type)((var).msgid!=(id))-1)&((var).u.type##_val)
 
+#define set_msgid_val(var, id, type, value)\
+	do{\
+		(var).msgid=(id); \
+		(var).u.type##_val=(value); \
+	}while(0)
+
 /* char to hex conversion table */
 static char fourbits2char[16] = { '0', '1', '2', '3', '4', '5',
 	'6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };