bescripts: Remove unused features and stale uses of gone features.

[libfirm] / ir / libcore / lc_printf.c

diff --git a/ir/libcore/lc_printf.c b/ir/libcore/lc_printf.c
index 2e6cedf..416fc66 100644 (file)
--- a/ir/libcore/lc_printf.c
+++ b/ir/libcore/lc_printf.c
@@ -35,8 +35,8 @@
 
 #include "xmalloc.h"
 #include "lc_printf.h"
-#include "lc_defines.h"
 #include "hashptr.h"
+#include "util.h"
 #include "set.h"
 
 /* printf implementation */
@@ -113,7 +113,7 @@ int lc_arg_register(lc_arg_env_t *env, const char *name, char letter, const lc_a
                base = 'a';
        }
 
-       ent = (lc_arg_t*)set_insert(env->args, &arg, sizeof(arg), HASH_STR(name, strlen(name)));
+       ent = set_insert(lc_arg_t, env->args, &arg, sizeof(arg), hash_str(name));
 
        if (ent && base != 0)
                map[letter - base] = ent;
@@ -136,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);
 }
 
 
@@ -172,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 */
@@ -297,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);
@@ -405,7 +405,7 @@ int lc_evpprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt,
 
                        /* Negative or lacking precision after a '.' is treated as
                         * precision 0. */
-                       occ.precision = LC_MAX(0, precision);
+                       occ.precision = MAX(0, precision);
                }
 
                /*
@@ -438,7 +438,7 @@ int lc_evpprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt,
                                                name[n] = '\0';
                                                tmp.name = name;
 
-                                               arg = (lc_arg_t*)set_find(env->args, &tmp, sizeof(tmp), HASH_STR(named, n));
+                                               arg = set_find(lc_arg_t, env->args, &tmp, sizeof(tmp), hash_str(named));
                                                occ.modifier = "";
                                                occ.modifier_length = 0;