[or-cvs] using an unsigned int for something that requires at least ...

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/common
In directory moria:/home/arma/work/onion/cvs/tor/src/common

Modified Files:
	log.c log.h 
Log Message:
using an unsigned int for something that requires at least 3 bytes
makes me uncomfortable.


Index: log.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/log.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- log.c	25 Oct 2005 17:42:09 -0000	1.103
+++ log.c	1 Nov 2005 06:15:48 -0000	1.104
@@ -184,7 +184,7 @@
  * message.  The actual message is derived as from tor_snprintf(format,ap).
  */
 static void
-logv(int severity, unsigned int domain, const char *funcname, const char *format,
+logv(int severity, uint32_t domain, const char *funcname, const char *format,
      va_list ap)
 {
   char buf[10024];
@@ -234,7 +234,7 @@
 
 /** Output a message to the log. */
 void
-_log(int severity, unsigned int domain, const char *format, ...)
+_log(int severity, uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -245,7 +245,7 @@
 /** Output a message to the log, prefixed with a function name <b>fn</b>. */
 #ifdef __GNUC__
 void
-_log_fn(int severity, unsigned int domain, const char *fn, const char *format, ...)
+_log_fn(int severity, uint32_t domain, const char *fn, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -255,7 +255,7 @@
 #else
 const char *_log_fn_function_name=NULL;
 void
-_log_fn(int severity, unsigned int domain, const char *format, ...)
+_log_fn(int severity, uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -264,7 +264,7 @@
   _log_fn_function_name = NULL;
 }
 void
-_debug(unsigned int domain, const char *format, ...)
+_debug(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -273,7 +273,7 @@
   _log_fn_function_name = NULL;
 }
 void
-_info(unsigned int domain, const char *format, ...)
+_info(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -282,7 +282,7 @@
   _log_fn_function_name = NULL;
 }
 void
-_notice(unsigned int domain, const char *format, ...)
+_notice(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -291,7 +291,7 @@
   _log_fn_function_name = NULL;
 }
 void
-_warn(unsigned int domain, const char *format, ...)
+_warn(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);
@@ -300,7 +300,7 @@
   _log_fn_function_name = NULL;
 }
 void
-_err(unsigned int domain, const char *format, ...)
+_err(uint32_t domain, const char *format, ...)
 {
   va_list ap;
   va_start(ap,format);

Index: log.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/common/log.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- log.h	25 Oct 2005 18:01:00 -0000	1.58
+++ log.h	1 Nov 2005 06:15:48 -0000	1.59
@@ -90,7 +90,7 @@
 /** Bandwidth accounting. */
 #define LD_ACCT     (1u<<17)
 
-typedef void (*log_callback)(int severity, unsigned int domain, const char *msg);
+typedef void (*log_callback)(int severity, uint32_t domain, const char *msg);
 
 int parse_log_level(const char *level);
 const char *log_level_to_string(int level);
@@ -113,11 +113,11 @@
                                   log_callback cb);
 
 /* Outputs a message to stdout */
-void _log(int severity, unsigned int domain, const char *format, ...) CHECK_PRINTF(3,4);
+void _log(int severity, uint32_t domain, const char *format, ...) CHECK_PRINTF(3,4);
 #define log _log /* hack it so we don't conflict with log() as much */
 
 #ifdef __GNUC__
-void _log_fn(int severity, unsigned int domain,
+void _log_fn(int severity, uint32_t domain,
              const char *funcname, const char *format, ...)
   CHECK_PRINTF(4,5);
 /** Log a message at level <b>severity</b>, using a pretty-printed version
@@ -137,12 +137,12 @@
 
 #else /* ! defined(__GNUC__) */
 
-void _log_fn(int severity, unsigned int domain, const char *format, ...);
-void _debug(unsigned int domain, const char *format, ...);
-void _info(unsigned int domain, const char *format, ...);
-void _notice(unsigned int domain, const char *format, ...);
-void _warn(unsigned int domain, const char *format, ...);
-void _err(unsigned int domain, const char *format, ...);
+void _log_fn(int severity, uint32_t domain, const char *format, ...);
+void _debug(uint32_t domain, const char *format, ...);
+void _info(uint32_t domain, const char *format, ...);
+void _notice(uint32_t domain, const char *format, ...);
+void _warn(uint32_t domain, const char *format, ...);
+void _err(uint32_t domain, const char *format, ...);
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 /* MSVC 6 and earlier don't have __FUNCTION__, or even __LINE__. */