change log messages

diff --git a/verbose.h b/verbose.h
index edac02dcd116ce6a04ffa40d7ecc2d054d4462be..539f0858f5c91ee3ddc631b6faaba25f2d0475ca 100644 (file)
--- a/verbose.h
+++ b/verbose.h
@@ -78,15 +78,11 @@ __BEGIN_DECLS
    @param format format string
    @param ... optionnal arguments
 */
-#define PRINTF(format...)                       \
-    do {                                        \
-        if (__LOG_PRINT__) {                    \
-            printf (__LOG_PRINT__ ": " format); \
-            fflush (stdout);                    \
-        } else {                                \
-            printf (format);                    \
-            fflush (stdout);                    \
-        }                                       \
+#define PRINTF(format...)                        \
+    do {                                         \
+        printf ("%s[%d]: ", __FILE__, __LINE__); \
+        printf (format);                         \
+        fflush (stdout);                         \
     } while (0)
 
 
@@ -99,22 +95,11 @@ __BEGIN_DECLS
 */
 #define FPRINTF(stream, format...)                       \
     do {                                                 \
-        if (__LOG_PRINT__) {                             \
-            fprintf (stream, __LOG_PRINT__ ": " format); \
-            fflush (stream);                             \
-        } else {                                         \
-            fprintf (stream, format);                    \
-            fflush (stream);                             \
-        }                                                \
+        fprintf (stream,"%s[%d]: ", __FILE__, __LINE__); \
+        fprintf (stream, format);                        \
+        fflush (stream);                                 \
     } while (0)
 
-/**
-   Prefix for log printing (default is __FILE__)
-*/
-#ifndef __LOG_PRINT__
-#define __LOG_PRINT__ __FILE__
-#endif
-
 __END_DECLS
 
-#endif /* __DEBUG_H__ */
+#endif /* __VERBOSE_H__ */