* Removed all Id tags.

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

diff --git a/src/toolbox/logging.h b/src/toolbox/logging.h
index 5783e4120a719bd889efe0546617e5262b351208..f6def38059908089d224f4f29446b0f8ac2e031e 100644 (file)
--- a/src/toolbox/logging.h
+++ b/src/toolbox/logging.h
@@ -1,9 +1,9 @@
 /* src/toolbox/logging.h - contains logging functions
 
-   Copyright (C) 1996-2005 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
+   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
 
    This file is part of CACAO.
 
@@ -19,16 +19,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
-
-   Contact: cacao@complang.tuwien.ac.at
-
-   Authors: Reinhard Grafl
-
-   Changes: Christan Thalinger
-
-   $Id: logging.h 2508 2005-05-23 08:50:25Z twisti $
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 */
 
@@ -36,12 +28,14 @@
 #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,20 +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);
 
-/* fflush logfile */
-void log_flush(void);
+void log_vprint(const char *text, va_list ap);
+void log_print(const char *text, ...);
+void log_println(const char *text, ...);
 
-/* newline and fflush */
-void log_nl(void);
+void log_finish(void);
 
-#if defined(STATISTICS)
-void log_cputime(void);
-#endif
 
 /* log message functions */
 void log_message_utf(const char *msg, utf *u);
@@ -75,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 */