Free set->catname even if it was incorrect

[simgrid.git] / src / xbt / log.c

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 3cf1ceb..2bc987f 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -13,6 +13,7 @@
 #include <stdio.h> /* snprintf */
 #include <stdlib.h> /* snprintf */
 #include "gras_config.h" /* to get a working stdarg.h */
+#include "portable.h" /* to get a working stdarg.h */
 
 #include "xbt_modinter.h"
 
@@ -203,17 +204,28 @@ First of all, each module should register its own category into the categories
 tree using \ref XBT_LOG_NEW_DEFAULT_SUBCATEGORY.
 
 Then, logging should be done with the DEBUG<n>, VERB<n>, INFO<n>, WARN<n>,
-ERROR<n> or CRITICAL<n> macro families. For each group, there is 6 different
-macros (like DEBUG0, DEBUG1, DEBUG2, DEBUG3, DEBUG4 and DEBUG5), only differing
-in the number of arguments passed along the format. This is because we want
-SimGrid itself to keep compilable on ancient compiler not supporting variable
-number of arguments to macros. But we should provide a macro simpler to use for
-the users not interested in SP3 machines (FIXME).
-
+ERROR<n> or CRITICAL<n> macro families (such as #DEBUG10, #VERB6,
+#INFO8, #WARN6, #ERROR6 and #CRITICAL6). For each group, there is at
+least 6 different macros (like DEBUG0, DEBUG1, DEBUG2, DEBUG3, DEBUG4 and
+DEBUG5), only differing in the number of arguments passed along the format.
+This is because we want SimGrid itself to keep compilable on ancient
+compiler not supporting variable number of arguments to macros. But we
+should provide a macro simpler to use for the users not interested in SP3
+machines (FIXME).
+  
 Under GCC, these macro check there arguments the same way than printf does. So,
 if you compile with -Wall, the folliwing code will issue a warning:
 <code>DEBUG2("Found %s (id %f)", some_string, a_double)</code>
 
+If you want to specify the category to log onto (for example because you
+have more than one category per file, add a C before the name of the log
+producing macro (ie, use #CDEBUG10, #CVERB6, #CINFO8, #CWARN6, #CERROR6 and
+#CCRITICAL6 and friends), and pass the category name as first argument.
+  
+The TRACE priority is not used the same way than the other. You should use
+the #XBT_IN, XBT_IN<n> (up to #XBT_IN5), #XBT_OUT and #XBT_HERE macros
+instead.
+
 \section log_API_example 2.5 Example of use
 
 Here is a more complete example:
@@ -547,7 +559,7 @@ static void _xbt_log_parse_setting(const char*        control_string,
   xbt_assert1(*dot == '.' && *eq == '=',
               "Invalid control string '%s'",control_string);
 
-  if (!strncmp(dot + 1, "thresh", min(eq - dot - 1,strlen("thresh")))) {
+  if (!strncmp(dot + 1, "thresh", min((size_t)(eq - dot - 1),strlen("thresh")))) {
     int i;
     char *neweq=xbt_strdup(eq+1);
     char *p=neweq-1;
@@ -566,7 +578,7 @@ static void _xbt_log_parse_setting(const char*        control_string,
       }
     }
     if (i<xbt_log_priority_infinite-1) {
-      set->thresh=i;
+      set->thresh= (e_xbt_log_priority_t) i;
     } else {
       xbt_assert1(FALSE,"Unknown priority name: %s",eq+1);
     }
@@ -673,7 +685,7 @@ void xbt_log_control_set(const char* control_string) {
     p=strrchr(cs,' ');
     if (p) {
       *p='\0';
-      *p++;
+      p++;
     } else {
       p=cs;
       done = 1;
@@ -687,6 +699,7 @@ void xbt_log_control_set(const char* control_string) {
       if (e.category != not_found_error)
        RETHROW;
       xbt_ex_free(e);
+      free(set->catname);
       found = 0;
 
       DEBUG0("Store for further application");