X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Flibcore%2Flc_printf.c;h=6ea8d3108d54113f25b0b6adf91b557fa4539af7;hb=6ccff2965d94c272f71df2a1655336af47bb7753;hp=1ac0cfacd4e6a1aaffa0e71ada6f807281b5d7bf;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/libcore/lc_printf.c b/ir/libcore/lc_printf.c
index 1ac0cfacd..6ea8d3108 100644
--- a/ir/libcore/lc_printf.c
+++ b/ir/libcore/lc_printf.c
@@ -33,11 +33,10 @@
 #include <assert.h>
 #include <ctype.h>
 
-#include "lc_common_t.h"
 #include "xmalloc.h"
 #include "lc_printf.h"
-#include "lc_defines.h"
 #include "hashptr.h"
+#include "util.h"
 #include "set.h"
 
 /* printf implementation */
@@ -72,10 +71,11 @@ lc_arg_env_t *lc_arg_get_default_env(void)
 	return _lc_arg_get_default_env();
 }
 
-static int lc_arg_cmp(const void *p1, const void *p2, UNUSED(size_t size))
+static int lc_arg_cmp(const void *p1, const void *p2, size_t size)
 {
 	const lc_arg_t *a1 = (const lc_arg_t*)p1;
 	const lc_arg_t *a2 = (const lc_arg_t*)p2;
+	(void) size;
 	return strcmp(a1->name, a2->name);
 }
 
@@ -104,11 +104,11 @@ int lc_arg_register(lc_arg_env_t *env, const char *name, char letter, const lc_a
 	arg.letter = letter;
 	arg.handler = handler;
 
-	if (isupper(letter)) {
+	if (isupper((unsigned char)letter)) {
 		map = env->upper;
 		base = 'A';
 	}
-	else if (islower(letter)) {
+	else if (islower((unsigned char)letter)) {
 		map = env->lower;
 		base = 'a';
 	}
@@ -121,8 +121,10 @@ int lc_arg_register(lc_arg_env_t *env, const char *name, char letter, const lc_a
 	return ent != NULL;
 }
 
-void lc_arg_unregister(UNUSED(lc_arg_env_t *env), UNUSED(const char *name))
+void lc_arg_unregister(lc_arg_env_t *env, const char *name)
 {
+	(void) env;
+	(void) name;
 }
 
 int lc_arg_append(lc_appendable_t *app, const lc_arg_occ_t *occ, const char *str, size_t len)
@@ -134,7 +136,7 @@ int lc_arg_append(lc_appendable_t *app, const lc_arg_occ_t *occ, const char *str
 	if (!occ->flag_minus && occ->flag_zero)
 		pad = '0';
 
-	return lc_appendable_snwadd(app, str, len, LC_MAX(0, occ->width), occ->flag_minus, pad);
+	return lc_appendable_snwadd(app, str, len, MAX(0, occ->width), occ->flag_minus, pad);
 }
 
 
@@ -170,7 +172,7 @@ static char *make_fmt(char *buf, size_t len, const lc_arg_occ_t *occ)
 
 	assert(occ->modifier && "modifier must not be NULL");
 	strncpy(mod, occ->modifier, sizeof(mod) - 1);
-	mod[LC_MIN(sizeof(mod) - 1, occ->modifier_length)] = '\0';
+	mod[MIN(sizeof(mod) - 1, occ->modifier_length)] = '\0';
 
 #ifdef _MSC_VER
 	/* work-around for buggy mscrt not supporting z, j,  and t modifier */
@@ -238,7 +240,7 @@ static int std_get_lc_arg_type(const lc_arg_occ_t *occ)
 				return modlen > 1 && mod[1] == 'h' ? lc_arg_type_char : lc_arg_type_short;
 			case 'l':
 				return modlen > 1 && mod[1] == 'l' ? lc_arg_type_long_long : lc_arg_type_long;
-#define TYPE_CASE(letter,type) case letter: return lc_arg_type_ ## type;
+#define TYPE_CASE(letter,type) case letter: return lc_arg_type_ ## type
 			TYPE_CASE('j', intmax_t);
 			TYPE_CASE('z', size_t);
 			TYPE_CASE('t', ptrdiff_t);
@@ -295,7 +297,7 @@ static int std_emit(lc_appendable_t *app, const lc_arg_occ_t *occ, const lc_arg_
 
 		default:
 			{
-				int len = LC_MAX(128, occ->width + 1);
+				int len = MAX(128, occ->width + 1);
 				char *buf = XMALLOCN(char, len);
 				res = dispatch_snprintf(buf, len, fmt, occ->lc_arg_type, val);
 				res = lc_appendable_snadd(app, buf, res);
@@ -398,12 +400,12 @@ int lc_evpprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt,
 
 		/* read the precision if given */
 		if (*s == '.') {
-			int val;
-			s = read_int(s + 1, &val);
+			int precision;
+			s = read_int(s + 1, &precision);
 
 			/* Negative or lacking precision after a '.' is treated as
 			 * precision 0. */
-			occ.precision = LC_MAX(0, val);
+			occ.precision = MAX(0, precision);
 		}
 
 		/*
@@ -423,7 +425,8 @@ int lc_evpprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt,
 					const char *named = ++s;
 
 					/* Read until the closing brace or end of the string. */
-					for (ch = *s; ch != '}' && ch != '\0'; ch = *++s);
+					for (ch = *s; ch != '}' && ch != '\0'; ch = *++s) {
+					}
 
 					if (s - named) {
 						size_t n = s - named;
@@ -459,12 +462,12 @@ int lc_evpprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt,
 					const char *mod = s;
 
 					/* Read, as long there are letters */
-					while (isalpha(ch) && !arg) {
+					while (isalpha((unsigned char)ch) && !arg) {
 						int base = 'a';
 						lc_arg_t * const *map = env->lower;
 
 						/* If uppercase, select the uppercase map from the environment */
-						if (isupper(ch)) {
+						if (isupper((unsigned char)ch)) {
 							base = 'A';
 							map = env->upper;
 						}