Changeset 803

Timestamp:

Aug 20, 2006, 10:45:04 PM (17 years ago)

Author:

joshe

Message:

Make message level available to message handler callback.

Location:

trunk/libtransmission

Files:

• transmission.h (modified) (2 diffs)
• utils.c (modified) (4 diffs)

trunk/libtransmission/transmission.h

@@ -67 +67 @@
  * function must be reentrant, it may be called from different threads.
  * A NULL argument means to print messages to stderr.  The function's
- * prototype should look like this: void myErrFunc( const char * );
- **********************************************************************/
-void tr_setMessageFunction( void (*func)( const char * ) );
+ * prototype should look like this: void myMsgFunc( int, const char * );
+ **********************************************************************/
+void tr_setMessageFunction( void (*func)( int, const char * ) );
 
 /***********************************************************************
@@ -78 +78 @@
 #define TR_MSG_ERR 1
 #define TR_MSG_INF 2
-#define TR_MSG_DBG 4
+#define TR_MSG_DBG 3
 void tr_setMessageLevel( int );
 int tr_getMessageLevel( void );

trunk/libtransmission/utils.c

@@ -25 +25 @@
 #include "transmission.h"
 
-static void (*messageFunc)( const char * );
+static void (*messageFunc)( int, const char * );
 
 static int verboseLevel = 0;
 
-void tr_setMessageFunction( void (*func)( const char * ) )
+void tr_setMessageFunction( void (*func)( int, const char * ) )
 {
     messageFunc = func;
@@ -36 +36 @@
 void tr_setMessageLevel( int level )
 {
-    verboseLevel = level;
+    verboseLevel = MAX( 0, level );
 }
 
@@ -53 +53 @@
         char * env;
         env          = getenv( "TR_DEBUG" );
-        verboseLevel = env ? atoi( env ) : -1;
-        verboseLevel = verboseLevel ? verboseLevel : -1;
+        verboseLevel = ( env ? atoi( env ) : 0 ) + 1;
+        verboseLevel = MAX( 1, verboseLevel );
     }
 
-    if( verboseLevel < 1 && level > TR_MSG_ERR )
-    {
-        return;
-    }
-    if( verboseLevel < 2 && level > TR_MSG_INF )
+    if( verboseLevel < level )
     {
         return;
@@ -76 +72 @@
     else
     {
-        messageFunc( string );
+        messageFunc( level, string );
     }
 }