More logging cleanup

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@180 400ebc74-4327-4243-bc38-086b20814532

diff --git a/log.c b/log.c
index b45f3db01c941ddf85a078b19dfb915dd546ca1c..9adbfc78d37fbc0f1105bfc363ffe62719853588 100644 (file)
--- a/log.c
+++ b/log.c
@@ -29,12 +29,17 @@
 
 #define MAX_PRINT_LEN  2048
 
-int debuglevel = LOGERROR;
+AMF_LogLevel debuglevel = LOGERROR;
 
 static int neednl;
 
 static FILE *fmsg;
 
+static const char *levels[] = {
+  "CRIT", "ERROR", "WARNING", "INFO",
+  "DEBUG", "DEBUG2"
+};
+
 void LogSetOutput(FILE *file)
 {
        fmsg = file;
@@ -99,9 +104,7 @@ void Log(int level, const char *format, ...)
                        putc('\n', fmsg);
                        neednl = 0;
                }
-               fprintf(fmsg, "\r%s: %s\n", level==LOGDEBUG?"DEBUG":(level==LOGERROR?
-"ERROR":(level==LOGWARNING?"WARNING":(level==LOGCRIT?"CRIT":"INFO"))), str);
-
+               fprintf(fmsg, "%s: %s\n", levels[level], str);
 #ifdef _DEBUG
                fflush(fmsg);
 #endif

diff --git a/log.h b/log.h
index b16bb0c784c6b37cbc63d341eec58c75fcd66977..db9970d127b0ac758c12372f05603cdd9ef19507 100644 (file)
--- a/log.h
+++ b/log.h
@@ -35,13 +35,10 @@ extern "C" {
 #undef NODEBUG
 #endif
 
-#define LOGCRIT         0
-#define LOGERROR        1
-#define LOGWARNING     2
-#define LOGINFO                3
-#define LOGDEBUG       4
-#define LOGDEBUG2      5
-#define LOGALL         6
+typedef enum
+{ LOGCRIT=0, LOGERROR, LOGWARNING, LOGINFO,
+  LOGDEBUG, LOGDEBUG2, LOGALL
+} AMF_LogLevel;
 
 #define Log    AMF_Log
 #define LogHex AMF_LogHex
@@ -51,7 +48,7 @@ extern "C" {
 #define LogStatus      AMF_LogStatus
 #define debuglevel     AMF_debuglevel
 
-extern int debuglevel;
+extern AMF_LogLevel debuglevel;
 
 void LogSetOutput(FILE *file);
 void LogPrintf(const char *format, ...);