From e6c04490090bdb41abf6b444142f841de630e01e Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 12 Jan 2008 14:34:53 +0100 Subject: [PATCH] rename NameFuncLink to name_func_list_t --- config.c | 7 +++---- layout.c | 2 +- uicb.c | 2 +- util.c | 4 ++-- util.h | 4 ++-- widget.c | 2 +- 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/config.c b/config.c index 3dec4b986..651d8e974 100644 --- a/config.c +++ b/config.c @@ -61,10 +61,9 @@ typedef struct unsigned int button; } MouseButton; -extern const NameFuncLink UicbList[]; -extern const NameFuncLink WidgetList[]; -extern const NameFuncLink LayoutsList[]; - +extern const name_func_link_t UicbList[]; +extern const name_func_link_t WidgetList[]; +extern const name_func_link_t LayoutsList[]; static unsigned int get_numlockmask(Display *disp) diff --git a/layout.c b/layout.c index 848919d96..d3cf7db0f 100644 --- a/layout.c +++ b/layout.c @@ -38,7 +38,7 @@ extern AwesomeConf globalconf; -const NameFuncLink LayoutsList[] = +const name_func_link_t LayoutsList[] = { {"tile", layout_tile}, {"tileleft", layout_tileleft}, diff --git a/uicb.c b/uicb.c index ef89f1791..b544aeacb 100644 --- a/uicb.c +++ b/uicb.c @@ -33,7 +33,7 @@ extern AwesomeConf globalconf; -const NameFuncLink UicbList[] = +const name_func_link_t UicbList[] = { /* xutil.c */ {"spawn", uicb_spawn}, diff --git a/util.c b/util.c index f43181f84..260323760 100644 --- a/util.c +++ b/util.c @@ -68,13 +68,13 @@ compute_new_value_from_arg(const char *arg, double current_value) /** Lookup for a function pointer from its name - * in the given NameFuncLink list + * in the given name_func_link_t list * \param funcname Function name * \param list Function and name link list * \return function pointer */ void * -name_func_lookup(const char *funcname, const NameFuncLink * list) +name_func_lookup(const char *funcname, const name_func_link_t *list) { int i; diff --git a/util.h b/util.h index 372ff3195..356117819 100644 --- a/util.h +++ b/util.h @@ -31,7 +31,7 @@ typedef struct { const char *name; void *func; -} NameFuncLink; +} name_func_link_t; /** \brief replace \c NULL strings with emtpy strings */ #define NONULL(x) (x ? x : "") @@ -220,7 +220,7 @@ void die(const char *, ...) __attribute__ ((noreturn)) __attribute__ ((format(pr void eprint(const char *, ...) __attribute__ ((noreturn)) __attribute__ ((format(printf, 1, 2))); double compute_new_value_from_arg(const char *, double); void warn(const char *, ...) __attribute__ ((format(printf, 1, 2))); -void *name_func_lookup(const char *, const NameFuncLink *); +void *name_func_lookup(const char *, const name_func_link_t *); #endif // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 diff --git a/widget.c b/widget.c index 1a7226d73..1cc12fa41 100644 --- a/widget.c +++ b/widget.c @@ -27,7 +27,7 @@ extern AwesomeConf globalconf; -const NameFuncLink WidgetList[] = +const name_func_link_t WidgetList[] = { {"taglist", taglist_new}, {"layoutinfo", layoutinfo_new},