From dedb5e32d1b6072cfb1c7c0fe5dcee8536d93654 Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 12 Jul 2017 16:56:26 +0000 Subject: rename one function, matching others, to help upcoming change --- calmwm.h | 4 ++-- conf.c | 4 ++-- kbfunc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/calmwm.h b/calmwm.h index ff7d156..cf02118 100644 --- a/calmwm.h +++ b/calmwm.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.339 2017/05/09 13:40:18 okan Exp $ + * $OpenBSD: calmwm.h,v 1.340 2017/07/12 16:56:26 okan Exp $ */ #ifndef _CALMWM_H_ @@ -488,7 +488,7 @@ void kbfunc_menu_cmd(void *, struct cargs *); void kbfunc_menu_group(void *, struct cargs *); void kbfunc_menu_exec(void *, struct cargs *); void kbfunc_menu_ssh(void *, struct cargs *); -void kbfunc_menu_client_label(void *, struct cargs *); +void kbfunc_client_menu_label(void *, struct cargs *); void kbfunc_exec_cmd(void *, struct cargs *); void kbfunc_exec_lock(void *, struct cargs *); void kbfunc_exec_term(void *, struct cargs *); diff --git a/conf.c b/conf.c index 4ece48b..e2ffa31 100644 --- a/conf.c +++ b/conf.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.231 2017/05/09 13:40:18 okan Exp $ + * $OpenBSD: conf.c,v 1.232 2017/07/12 16:56:26 okan Exp $ */ #include @@ -60,7 +60,7 @@ static const struct { enum context context; int flag; } name_to_func[] = { - { "window-menu-label", kbfunc_menu_client_label, CWM_CONTEXT_CC, 0 }, + { "window-menu-label", kbfunc_client_menu_label, CWM_CONTEXT_CC, 0 }, { "window-lower", kbfunc_client_lower, CWM_CONTEXT_CC, 0 }, { "window-raise", kbfunc_client_raise, CWM_CONTEXT_CC, 0 }, { "window-hide", kbfunc_client_hide, CWM_CONTEXT_CC, 0 }, diff --git a/kbfunc.c b/kbfunc.c index 6fe964f..2d7d34f 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: kbfunc.c,v 1.146 2017/07/10 13:36:58 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.147 2017/07/12 16:56:26 okan Exp $ */ #include @@ -522,7 +522,7 @@ out: } void -kbfunc_menu_client_label(void *ctx, struct cargs *cargs) +kbfunc_client_menu_label(void *ctx, struct cargs *cargs) { struct client_ctx *cc = ctx; struct menu *mi; -- cgit v1.2.3-2-gb3c3