X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fcommon%2Fdebug.c;h=7ff6ef6275d63120fc1c04d7305b13341c4528df;hb=b42d141b27222454d6176f233327c594d71be554;hp=918ade01af7d9035df5819bcf7dd5a898ecc4277;hpb=279276d88fb9248284c8961d5c647b632fe2a26e;p=libfirm

diff --git a/ir/common/debug.c b/ir/common/debug.c
index 918ade01a..7ff6ef627 100644
--- a/ir/common/debug.c
+++ b/ir/common/debug.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -24,11 +24,7 @@
  * @date    15.12.2004
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-
-#include "firm_config.h"
 
 #ifdef DEBUG_libfirm
 
@@ -48,7 +44,7 @@ static set *module_set;
 /**
  * A debug module.
  */
-struct _firm_dbg_module_t {
+struct firm_dbg_module_t {
   unsigned mask;
   const char *name;
   FILE *file;
@@ -59,8 +55,8 @@ struct _firm_dbg_module_t {
  */
 static int module_cmp(const void *p1, const void *p2, size_t size)
 {
-  const firm_dbg_module_t *m1 = p1;
-  const firm_dbg_module_t *m2 = p2;
+  const firm_dbg_module_t *m1 = (const firm_dbg_module_t*)p1;
+  const firm_dbg_module_t *m2 = (const firm_dbg_module_t*)p2;
   (void) size;
 
   return strcmp(m1->name, m2->name);
@@ -82,10 +78,10 @@ firm_dbg_module_t *firm_dbg_register(const char *name)
   mod.name = name;
   mod.file = stderr;
 
-  if(!module_set)
+  if (!module_set)
     firm_dbg_init();
 
-  return set_insert(module_set, &mod, sizeof(mod), HASH_STR(name, strlen(name)));
+  return (firm_dbg_module_t*)set_insert(module_set, &mod, sizeof(mod), HASH_STR(name, strlen(name)));
 }
 
 void firm_dbg_set_mask(firm_dbg_module_t *module, unsigned mask)
@@ -106,7 +102,7 @@ void firm_dbg_set_file(firm_dbg_module_t *module, FILE *file)
 /**
  * A message info: a pair of debug handle and message
  */
-typedef struct _msg_info_t {
+typedef struct msg_info_t {
   const char *msg;
   const firm_dbg_module_t *mod;
 } msg_info_t;
@@ -118,13 +114,13 @@ typedef struct _msg_info_t {
 static void *make_msg_info(const firm_dbg_module_t *mod, const char *fmt, va_list args)
 {
   static const char msg_header[] = "%s(%d) %s: ";
-  msg_info_t *res = obstack_alloc(&dbg_obst, sizeof(*res));
+  msg_info_t *res = OALLOC(&dbg_obst, msg_info_t);
 
   obstack_grow(&dbg_obst, msg_header, sizeof(msg_header) - 1);
   ir_obst_vprintf(&dbg_obst, fmt, args);
   obstack_1grow(&dbg_obst, '\0');
 
-  res->msg = obstack_finish(&dbg_obst);
+  res->msg = (const char*)obstack_finish(&dbg_obst);
   res->mod = mod;
   return res;
 }
@@ -133,7 +129,7 @@ void *_firm_dbg_make_msg(const firm_dbg_module_t *mod, unsigned mask, const char
 {
   void *res = NULL;
 
-  if(mask == 0 || (mod->mask & mask)) {
+  if (mask == 0 || (mod->mask & mask)) {
     va_list args;
     va_start(args, fmt);
     res = make_msg_info(mod, fmt, args);
@@ -145,8 +141,8 @@ void *_firm_dbg_make_msg(const firm_dbg_module_t *mod, unsigned mask, const char
 
 void _firm_dbg_print_msg(const char *filename, int line, const char *func, void *mi_ptr)
 {
-  msg_info_t *mi = mi_ptr;
-  if(mi) {
+  msg_info_t *mi = (msg_info_t*)mi_ptr;
+  if (mi) {
     fprintf(mi->mod->file, mi->msg, filename, line, func);
     obstack_free(&dbg_obst, mi);
   }
@@ -154,14 +150,14 @@ void _firm_dbg_print_msg(const char *filename, int line, const char *func, void
 
 void _firm_dbg_print(const firm_dbg_module_t *mod, unsigned mask, const char *fmt, ...)
 {
-  if(mask == 0 || (mod->mask & mask)) {
+  if (mask == 0 || (mod->mask & mask)) {
     va_list args;
     char *res;
     va_start(args, fmt);
     ir_obst_vprintf(&dbg_obst, fmt, args);
     obstack_1grow(&dbg_obst, '\0');
-    res = obstack_finish(&dbg_obst);
-    fprintf(mod->file, res);
+    res = (char*)obstack_finish(&dbg_obst);
+    fprintf(mod->file, "%s", res);
     obstack_free(&dbg_obst, res);
     va_end(args);
   }