diff options
| author | okan <okan> | 2016-10-24 17:39:38 +0000 |
|---|---|---|
| committer | okan <okan> | 2016-10-24 17:39:38 +0000 |
| commit | eb43101591ca45754f4805dd1f7101c79a487ddb (patch) | |
| tree | 9ad7ed4b8fd6740bd513978cdc3b801c080040c9 | |
| parent | ffd60b3cabc361f9432c863ff58e823db5b7aa14 (diff) | |
| download | cwm-eb43101591ca45754f4805dd1f7101c79a487ddb.tar.gz cwm-eb43101591ca45754f4805dd1f7101c79a487ddb.tar.xz cwm-eb43101591ca45754f4805dd1f7101c79a487ddb.zip | |
Sprinkle __func__ in appropriate error messages.
| -rw-r--r-- | conf.c | 4 | ||||
| -rw-r--r-- | group.c | 6 | ||||
| -rw-r--r-- | kbfunc.c | 6 | ||||
| -rw-r--r-- | screen.c | 2 | ||||
| -rw-r--r-- | search.c | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/conf.c b/conf.c index 156bb71..f0f1dde 100644 --- a/conf.c +++ b/conf.c @@ -138,7 +138,7 @@ conf_screen(struct screen_ctx *sc) if (sc->xftfont == NULL) { sc->xftfont = XftFontOpenName(X_Dpy, sc->which, Conf.font); if (sc->xftfont == NULL) - errx(1, "XftFontOpenName: %s", Conf.font); + errx(1, "%s: XftFontOpenName: %s", __func__, Conf.font); } for (i = 0; i < nitems(color_binds); i++) { @@ -169,7 +169,7 @@ conf_screen(struct screen_ctx *sc) sc->menu.xftdraw = XftDrawCreate(X_Dpy, sc->menu.win, visual, colormap); if (sc->menu.xftdraw == NULL) - errx(1, "XftDrawCreate"); + errx(1, "%s: XftDrawCreate", __func__); conf_grab_kbd(sc->rootwin); } diff --git a/group.c b/group.c index ec368de..a26c53d 100644 --- a/group.c +++ b/group.c @@ -155,7 +155,7 @@ group_movetogroup(struct client_ctx *cc, int idx) struct group_ctx *gc; if (idx < 0 || idx >= Conf.ngroups) - errx(1, "group_movetogroup: index out of range (%d)", idx); + errx(1, "%s: index out of range (%d)", __func__, idx); TAILQ_FOREACH(gc, &sc->groupq, entry) { if (gc->num == idx) @@ -223,7 +223,7 @@ group_hidetoggle(struct screen_ctx *sc, int idx) struct group_ctx *gc; if (idx < 0 || idx >= Conf.ngroups) - errx(1, "group_hidetoggle: index out of range (%d)", idx); + errx(1, "%s: index out of range (%d)", __func__, idx); TAILQ_FOREACH(gc, &sc->groupq, entry) { if (gc->num == idx) @@ -246,7 +246,7 @@ group_only(struct screen_ctx *sc, int idx) struct group_ctx *gc; if (idx < 0 || idx >= Conf.ngroups) - errx(1, "group_only: index out of range (%d)", idx); + errx(1, "%s: index out of range (%d)", __func__, idx); TAILQ_FOREACH(gc, &sc->groupq, entry) { if (gc->num == idx) diff --git a/kbfunc.c b/kbfunc.c index ef2334f..c1a1812 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -405,7 +405,7 @@ kbfunc_menu_exec(void *ctx, union arg *arg, enum xev xev) label = "wm"; break; default: - errx(1, "kbfunc_menu_exec: invalid cmd %d", cmd); + errx(1, "%s: invalid cmd %d", __func__, cmd); /* NOTREACHED */ } @@ -456,7 +456,7 @@ kbfunc_menu_exec(void *ctx, union arg *arg, enum xev xev) Conf.wm_argv = xstrdup(mi->text); break; default: - errx(1, "kb_func: egad, cmd changed value!"); + errx(1, "%s: egad, cmd changed value!", __func__); /* NOTREACHED */ } } @@ -487,7 +487,7 @@ kbfunc_menu_ssh(void *ctx, union arg *arg, enum xev xev) TAILQ_INIT(&menuq); if ((fp = fopen(Conf.known_hosts, "r")) == NULL) { - warn("kbfunc_menu_ssh: %s", Conf.known_hosts); + warn("%s: %s", __func__, Conf.known_hosts); goto menu; } diff --git a/screen.c b/screen.c index 4badf65..5887784 100644 --- a/screen.c +++ b/screen.c @@ -101,7 +101,7 @@ screen_find(Window win) if (sc->rootwin == win) return(sc); } - warnx("screen_find failure win 0x%lu\n", win); + warnx("%s: failure win 0x%lu\n", __func__, win); return(NULL); } diff --git a/search.c b/search.c index 9ca4e5d..da05ae8 100644 --- a/search.c +++ b/search.c @@ -85,7 +85,7 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) tier--; if (tier >= nitems(tierp)) - errx(1, "search_match_client: invalid tier"); + errx(1, "%s: invalid tier", __func__); /* * If you have a tierp, insert after it, and make it |