X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Flibcore%2Flc_appendable.c;h=f62aa6bc6b1a29f0c5eb049c189af9395e4c5bf0;hb=a147197e0d20514db14cd60a2e876bcdd6c05f66;hp=9a3f7ad94ef70a996f952884816e88cf147d319f;hpb=9c359401bbbb6cc870909cf556f87a375807bdb7;p=libfirm

diff --git a/ir/libcore/lc_appendable.c b/ir/libcore/lc_appendable.c
index 9a3f7ad94..f62aa6bc6 100644
--- a/ir/libcore/lc_appendable.c
+++ b/ir/libcore/lc_appendable.c
@@ -22,8 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lc_common_t.h"
-#include "lc_defines.h"
+#include "util.h"
 #include "lc_printf.h"
 
 /* Default appendable implementations */
@@ -32,7 +31,7 @@ int lc_appendable_snwadd(lc_appendable_t *app, const char *str, size_t len,
 		unsigned int width, int left_just, char pad)
 {
 	int res = 0;
-	int i;
+	size_t i;
 	size_t to_pad = width > len ? width - len : 0;
 
 	/* If not left justified, pad left */
@@ -61,12 +60,14 @@ void lc_appendable_init(lc_appendable_t *env, const lc_appendable_funcs_t *app,
 	app->init(env);
 }
 
-static void default_init(UNUSED(lc_appendable_t *env))
+static void default_init(lc_appendable_t *env)
 {
+	(void) env;
 }
 
-static void default_finish(UNUSED(lc_appendable_t *env))
+static void default_finish(lc_appendable_t *env)
 {
+	(void) env;
 }
 
 /*
@@ -108,7 +109,7 @@ static void str_init(lc_appendable_t *obj)
 
 static int str_snadd(lc_appendable_t *obj, const char *str, size_t n)
 {
-	size_t to_write = LC_MIN(obj->limit - obj->written - 1, n);
+	size_t to_write = MIN(obj->limit - obj->written - 1, n);
 	char *tgt = (char*)obj->obj;
 	strncpy(tgt + obj->written, str, to_write);
 	obj->written += to_write;