summaryrefslogtreecommitdiffhomepage
path: root/ir/libcore
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2014-12-31 06:18:56 +0100
committerMatthias Braun <matze@braunis.de>2014-12-31 06:53:59 +0100
commit174cca07608c9688dd9425ef03ccc0dac4725161 (patch)
tree398c3ac1af0ca67848c2eb4b427f7a97a0d66cd0 /ir/libcore
parent42aa1212707a3007f7d820bf04e59bfab71ca2ba (diff)
remove a bunch of unused convenience printers from libcore
Diffstat (limited to 'ir/libcore')
-rw-r--r--ir/libcore/lc_printf.c125
-rw-r--r--ir/libcore/lc_printf.h17
2 files changed, 0 insertions, 142 deletions
diff --git a/ir/libcore/lc_printf.c b/ir/libcore/lc_printf.c
index 21bb07d..379b8f6 100644
--- a/ir/libcore/lc_printf.c
+++ b/ir/libcore/lc_printf.c
@@ -38,22 +38,6 @@ struct lc_arg_env_t {
lc_arg_t *upper[26]; /**< Map for upper conversion specifiers. */
};
-/** The default argument environment. */
-static lc_arg_env_t *default_env = NULL;
-
-static inline lc_arg_env_t *_lc_arg_get_default_env(void)
-{
- if (!default_env)
- default_env = lc_arg_add_std(lc_arg_new_env());
-
- return default_env;
-}
-
-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, size_t size)
{
const lc_arg_t *a1 = (const lc_arg_t*)p1;
@@ -62,7 +46,6 @@ static int lc_arg_cmp(const void *p1, const void *p2, size_t size)
return strcmp(a1->name, a2->name);
}
-
lc_arg_env_t *lc_arg_new_env(void)
{
lc_arg_env_t *env = XMALLOCZ(lc_arg_env_t);
@@ -496,56 +479,6 @@ int lc_evpprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt,
/* Convenience implementations */
-int lc_epprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_evpprintf(env, app, fmt, args);
- va_end(args);
- return res;
-}
-
-int lc_pprintf(lc_appendable_t *app, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_vpprintf(app, fmt, args);
- va_end(args);
- return res;
-}
-
-int lc_vpprintf(lc_appendable_t *app, const char *fmt, va_list args)
-{
- return lc_evpprintf(_lc_arg_get_default_env(), app, fmt, args);
-}
-
-int lc_eprintf(const lc_arg_env_t *env, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_efprintf(env, stdout, fmt, args);
- va_end(args);
- return res;
-}
-
-int lc_esnprintf(const lc_arg_env_t *env, char *buf, size_t len, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_evsnprintf(env, buf, len, fmt, args);
- va_end(args);
- return res;
-}
-
-int lc_efprintf(const lc_arg_env_t *env, FILE *file, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_evfprintf(env, file, fmt, args);
- va_end(args);
- return res;
-}
-
int lc_eoprintf(const lc_arg_env_t *env, struct obstack *obst, const char *fmt, ...)
{
va_list args;
@@ -589,61 +522,3 @@ int lc_evoprintf(const lc_arg_env_t *env, struct obstack *obst, const char *fmt,
lc_appendable_finish(&app);
return res;
}
-
-
-int lc_printf(const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_vprintf(fmt, args);
- va_end(args);
- return res;
-}
-
-int lc_snprintf(char *buf, size_t len, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_vsnprintf(buf, len, fmt, args);
- va_end(args);
- return res;
-}
-
-int lc_fprintf(FILE *f, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_vfprintf(f, fmt, args);
- va_end(args);
- return res;
-}
-
-int lc_oprintf(struct obstack *obst, const char *fmt, ...)
-{
- va_list args;
- va_start(args, fmt);
- int res = lc_voprintf(obst, fmt, args);
- va_end(args);
- return res;
-}
-
-
-int lc_vprintf(const char *fmt, va_list args)
-{
- return lc_evprintf(_lc_arg_get_default_env(), fmt, args);
-}
-
-int lc_vsnprintf(char *buf, size_t len, const char *fmt, va_list args)
-{
- return lc_evsnprintf(_lc_arg_get_default_env(), buf, len, fmt, args);
-}
-
-int lc_vfprintf(FILE *f, const char *fmt, va_list args)
-{
- return lc_evfprintf(_lc_arg_get_default_env(), f, fmt, args);
-}
-
-int lc_voprintf(struct obstack *obst, const char *fmt, va_list args)
-{
- return lc_evoprintf(_lc_arg_get_default_env(), obst, fmt, args);
-}
diff --git a/ir/libcore/lc_printf.h b/ir/libcore/lc_printf.h
index 0d74f2c..3892d4e 100644
--- a/ir/libcore/lc_printf.h
+++ b/ir/libcore/lc_printf.h
@@ -69,7 +69,6 @@ typedef struct lc_arg_env_t lc_arg_env_t;
lc_arg_env_t *lc_arg_new_env(void);
void lc_arg_free_env(lc_arg_env_t *env);
-lc_arg_env_t *lc_arg_get_default_env(void);
int lc_arg_register(lc_arg_env_t *env, const char *name, char letter, const lc_arg_handler_t *handler);
void lc_arg_unregister(lc_arg_env_t *env, const char *name);
@@ -78,14 +77,8 @@ lc_arg_env_t *lc_arg_add_std(lc_arg_env_t *env);
int lc_arg_append(lc_appendable_t *app, const lc_arg_occ_t *occ, const char *str, size_t len);
-int lc_epprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt, ...);
int lc_evpprintf(const lc_arg_env_t *env, lc_appendable_t *app, const char *fmt, va_list args);
-int lc_pprintf(lc_appendable_t *app, const char *fmt, ...);
-int lc_vpprintf(lc_appendable_t *app, const char *fmt, va_list args);
-int lc_eprintf(const lc_arg_env_t *env, const char *fmt, ...);
-int lc_esnprintf(const lc_arg_env_t *env, char *buf, size_t len, const char *fmt, ...);
-int lc_efprintf(const lc_arg_env_t *env, FILE *file, const char *fmt, ...);
int lc_eoprintf(const lc_arg_env_t *env, struct obstack *obst, const char *fmt, ...);
int lc_evprintf(const lc_arg_env_t *env, const char *fmt, va_list args);
@@ -93,14 +86,4 @@ int lc_evsnprintf(const lc_arg_env_t *env, char *buf, size_t len, const char *fm
int lc_evfprintf(const lc_arg_env_t *env, FILE *f, const char *fmt, va_list args);
int lc_evoprintf(const lc_arg_env_t *env, struct obstack *obst, const char *fmt, va_list args);
-int lc_printf(const char *fmt, ...);
-int lc_snprintf(char *buf, size_t len, const char *fmt, ...);
-int lc_fprintf(FILE *f, const char *fmt, ...);
-int lc_oprintf(struct obstack *obst, const char *fmt, ...);
-
-int lc_vprintf(const char *fmt, va_list args);
-int lc_vsnprintf(char *buf, size_t len, const char *fmt, va_list args);
-int lc_vfprintf(FILE *f, const char *fmt, va_list args);
-int lc_voprintf(struct obstack *obst, const char *fmt, va_list args);
-
#endif