* Removed all Id tags.

[cacao.git] / src / toolbox / logging.h

diff --git a/src/toolbox/logging.h b/src/toolbox/logging.h
index f50c156b5234bf4754bcd7c9af08a8976d7d1a35..f6def38059908089d224f4f29446b0f8ac2e031e 100644 (file)
--- a/src/toolbox/logging.h
+++ b/src/toolbox/logging.h
@@ -1,6 +1,6 @@
 /* src/toolbox/logging.h - contains logging functions
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel,
    C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
    E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
    J. Wenninger, Institut f. Computersprachen - TU Wien
@@ -22,26 +22,20 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Reinhard Grafl
-
-   Changes: Christan Thalinger
-
-   $Id: logging.h 4357 2006-01-22 23:33:38Z twisti $
-
 */
 
 
 #ifndef _LOGGING_H
 #define _LOGGING_H
 
+#include "config.h"
+
 #include <stdio.h>
+#include <stdarg.h>
 
-#include "config.h"
-#include "vm/class.h"
-#include "vm/method.h"
-#include "vm/utf8.h"
+#include "vmcore/class.h"
+#include "vmcore/method.h"
+#include "vmcore/utf8.h"
 
 
 /*500 is to small for eclipse traces, (builtin_trace_args, perhaps the
@@ -53,16 +47,15 @@ instead of setting the size for all invocations that big*/
 /* function prototypes ********************************************************/
 
 void log_init(const char *fname);
-void log_text(const char *txt);
 
-/* same as log_text without "LOG: " and newline */
-void log_plain(const char *txt);
+void log_start(void);
+
+void log_vprint(const char *text, va_list ap);
+void log_print(const char *text, ...);
+void log_println(const char *text, ...);
 
-/* fflush logfile */
-void log_flush(void);
+void log_finish(void);
 
-/* newline and fflush */
-void log_nl(void);
 
 /* log message functions */
 void log_message_utf(const char *msg, utf *u);
@@ -71,16 +64,8 @@ void log_message_class_message_class(const char *msg1, classinfo *c1,
                                                                         const char *msg2, classinfo *c2);
 void log_message_method(const char *msg, methodinfo *m);
 
-void dolog(const char *txt, ...);
-
-/* same as dolog without "LOG: " and newline*/
-void dolog_plain(const char *txt, ...);
-
-FILE *get_logfile(void);                        /* return the current logfile */
-
-/* write utf symbol to logfile/stdout */
-void log_utf(utf *u);
-void log_plain_utf(utf *u);
+#define log_text(s) log_println("%s", (s))
+#define dolog log_println
 
 #endif /* _LOGGING_H */