diff options
| author | okan | 2011-03-22 10:57:31 +0000 |
|---|---|---|
| committer | okan | 2011-03-22 10:57:31 +0000 |
| commit | c5841193570edf6eca119c583d9e790eef12dcb1 (patch) | |
| tree | 82cb7021fa6527f717129aceabeaa68ff00fde3a /conf.c | |
| parent | 6744c6dfbae31f04a8b397d35d144743b5845246 (diff) | |
| download | cwm-c5841193570edf6eca119c583d9e790eef12dcb1.tar.gz | |
introduce nitems macro, with the appropriate ifndef.
ok oga@
Diffstat (limited to '')
| -rw-r--r-- | conf.c | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -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. * - * $Id: conf.c,v 1.76 2010/01/27 03:04:50 okan Exp $ + * $Id: conf.c,v 1.77 2011/03/22 10:57:31 okan Exp $ */ #include <sys/param.h> @@ -191,10 +191,10 @@ conf_init(struct conf *c) TAILQ_INIT(&c->autogroupq); TAILQ_INIT(&c->mousebindingq); - for (i = 0; i < sizeof(kb_binds) / sizeof(kb_binds[0]); i++) + for (i = 0; i < nitems(kb_binds); i++) conf_bindname(c, kb_binds[i].key, kb_binds[i].func); - for (i = 0; i < sizeof(m_binds) / sizeof(m_binds[0]); i++) + for (i = 0; i < nitems(m_binds); i++) conf_mousebind(c, m_binds[i].key, m_binds[i].func); /* Default term/lock */ @@ -467,8 +467,7 @@ conf_bindname(struct conf *c, char *name, char *binding) current_binding = xcalloc(1, sizeof(*current_binding)); if ((substring = strchr(name, '-')) != NULL) { - for (iter = 0; iter < (sizeof(bind_mods) / - sizeof(bind_mods[0])); iter++) { + for (iter = 0; iter < nitems(bind_mods); iter++) { if ((tmp = strchr(name, bind_mods[iter].chr)) != NULL && tmp < substring) { current_binding->modmask |= @@ -573,8 +572,7 @@ conf_mousebind(struct conf *c, char *name, char *binding) current_binding = xcalloc(1, sizeof(*current_binding)); if ((substring = strchr(name, '-')) != NULL) { - for (iter = 0; iter < (sizeof(bind_mods) / - sizeof(bind_mods[0])); iter++) { + for (iter = 0; iter < nitems(bind_mods); iter++) { if ((tmp = strchr(name, bind_mods[iter].chr)) != NULL && tmp < substring) { current_binding->modmask |= |