diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-01-07 22:52:33 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-01-07 22:52:33 +0000 |
| commit | 4846ad16579f7fcf06fe01e03a56815b2d8c4a93 (patch) | |
| tree | e5266f60bcd3e2fbdb203a10b26c67970ddc45a8 /server-msg.c | |
| parent | 4924d8e1e2c367b9593a6972e1bcb65ab0cb0a93 (diff) | |
| download | rtmux-4846ad16579f7fcf06fe01e03a56815b2d8c4a93.tar.gz rtmux-4846ad16579f7fcf06fe01e03a56815b2d8c4a93.tar.bz2 rtmux-4846ad16579f7fcf06fe01e03a56815b2d8c4a93.zip | |
Introduce nitems() and use it; use bsearch.
Diffstat (limited to 'server-msg.c')
| -rw-r--r-- | server-msg.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/server-msg.c b/server-msg.c index 85344f72..e8d85033 100644 --- a/server-msg.c +++ b/server-msg.c @@ -1,4 +1,4 @@ -/* $Id: server-msg.c,v 1.52 2008-09-26 06:45:27 nicm Exp $ */ +/* $Id: server-msg.c,v 1.53 2009-01-07 22:52:33 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -48,7 +48,6 @@ const struct server_msg server_msg_table[] = { { MSG_RESIZE, server_msg_fn_resize }, { MSG_EXITING, server_msg_fn_exiting } }; -#define NSERVERMSG (sizeof server_msg_table / sizeof server_msg_table[0]) int server_msg_dispatch(struct client *c) @@ -66,7 +65,7 @@ server_msg_dispatch(struct client *c) return (0); buffer_remove(c->in, sizeof hdr); - for (i = 0; i < NSERVERMSG; i++) { + for (i = 0; i < nitems(server_msg_table); i++) { msg = server_msg_table + i; if (msg->type == hdr.type) { if ((n = msg->fn(&hdr, c)) != 0) @@ -74,7 +73,7 @@ server_msg_dispatch(struct client *c) break; } } - if (i == NSERVERMSG) + if (i == nitems(server_msg_table)) fatalx("unexpected message"); } } |