X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Ftoolbox%2Flogging.h;h=bcf2e65389eb0037c7f7fe153f9899043c758b0d;hb=c114738c2ae47c62032ab6f1008846fe660aaa22;hp=07a6f24ae3e245d274c46f2e2c50ebfc8d683557;hpb=e9316f24c00420dd25223f2a9110276555424cc6;p=cacao.git

diff --git a/src/toolbox/logging.h b/src/toolbox/logging.h
index 07a6f24ae..bcf2e6538 100644
--- a/src/toolbox/logging.h
+++ b/src/toolbox/logging.h
@@ -1,10 +1,7 @@
-/* toolbox/logging.h - contains logging functions
+/* src/toolbox/logging.h - contains logging functions
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   Institut f. Computersprachen, TU Wien
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Probst,
-   S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich,
-   J. Wenninger
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -20,14 +17,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
-
-   $Id: logging.h 1636 2004-12-01 09:59:31Z twisti $
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
 */
 
@@ -35,36 +26,46 @@
 #ifndef _LOGGING_H
 #define _LOGGING_H
 
+#include "config.h"
+
 #include <stdio.h>
+#include <stdarg.h>
 
-#include "vm/global.h"
+#include "vm/class.h"
+#include "vm/method.h"
+#include "vm/utf8.h"
 
 
-#define MAXLOGTEXT 500
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-/* function prototypes */
+/* function prototypes ********************************************************/
 
-void log_init(char *fname);
-void log_text(char *txt);
-void log_plain(char *txt); /* same as log_text without "LOG: " and newline */
-void log_flush();          /* fflush logfile */
-void log_nl();             /* newline and fflush */
+void log_init(const char *fname);
 
-void log_cputime();
+void log_start(void);
 
-void log_message_class(char *msg, classinfo *c);
-void log_message_method(char *msg, methodinfo *m);
+void log_vprint(const char *text, va_list ap);
+void log_print(const char *text, ...);
+void log_println(const char *text, ...);
 
-void dolog(char *txt, ...);
-void dolog_plain(char *txt, ...); /* same as dolog without "LOG: " and newline */
-void error(char *txt, ...);
+void log_finish(void);
 
-/* XXX this is just a quick hack on darwin */
-#if !defined(__DARWIN__)
-void panic(char *txt);
-#endif
 
-FILE *get_logfile(); /* return the current logfile */
+/* log message functions */
+void log_message_utf(const char *msg, utf *u);
+void log_message_class(const char *msg, classinfo *c);
+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);
+
+#define log_text(s) log_println("%s", (s))
+#define dolog log_println
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _LOGGING_H */