fix more cparser warnings, cleanup some libcore code

[libfirm] / ir / common / debug.c

diff --git a/ir/common/debug.c b/ir/common/debug.c
index ac8e79a..f8e3dca 100644 (file)
--- a/ir/common/debug.c
+++ b/ir/common/debug.c
@@ -51,12 +51,12 @@ struct firm_dbg_module_t {
 };
 
 /**
- * Compares two modules by comparing it's names
+ * Compares two modules by comparing their names
  */
 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);
@@ -81,7 +81,7 @@ firm_dbg_module_t *firm_dbg_register(const char *name)
   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)
@@ -120,7 +120,7 @@ static void *make_msg_info(const firm_dbg_module_t *mod, const char *fmt, va_lis
   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;
 }
@@ -141,7 +141,7 @@ 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;
+  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);
@@ -156,7 +156,7 @@ void _firm_dbg_print(const firm_dbg_module_t *mod, unsigned mask, const char *fm
     va_start(args, fmt);
     ir_obst_vprintf(&dbg_obst, fmt, args);
     obstack_1grow(&dbg_obst, '\0');
-    res = obstack_finish(&dbg_obst);
+    res = (char*)obstack_finish(&dbg_obst);
     fprintf(mod->file, "%s", res);
     obstack_free(&dbg_obst, res);
     va_end(args);