cmd_itest: constify & localize op table

No one else needs this table.  While we're here, use the standard
ARRAY_SIZE helper macro.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2010-10-20 07:17:33 -04:00 committed by Wolfgang Denk
parent bdbc1303cb
commit fc9903f38d
1 changed files with 3 additions and 5 deletions

View File

@ -46,7 +46,7 @@ struct op_tbl_s {
typedef struct op_tbl_s op_tbl_t; typedef struct op_tbl_s op_tbl_t;
op_tbl_t op_table [] = { static const op_tbl_t op_table [] = {
{ "-lt", LT }, { "-lt", LT },
{ "<" , LT }, { "<" , LT },
{ "-gt", GT }, { "-gt", GT },
@ -62,8 +62,6 @@ op_tbl_t op_table [] = {
{ "<=" , LE }, { "<=" , LE },
}; };
#define op_tbl_size (sizeof(op_table)/sizeof(op_table[0]))
static long evalexp(char *s, int w) static long evalexp(char *s, int w)
{ {
long l = 0; long l = 0;
@ -138,12 +136,12 @@ static int arithcomp (char *s, char *t, int op, int w)
int binary_test (char *op, char *arg1, char *arg2, int w) int binary_test (char *op, char *arg1, char *arg2, int w)
{ {
int len, i; int len, i;
op_tbl_t *optp; const op_tbl_t *optp;
len = strlen(op); len = strlen(op);
for (optp = (op_tbl_t *)&op_table, i = 0; for (optp = (op_tbl_t *)&op_table, i = 0;
i < op_tbl_size; i < ARRAY_SIZE(op_table);
optp++, i++) { optp++, i++) {
if ((strncmp (op, optp->op, len) == 0) && (len == strlen (optp->op))) { if ((strncmp (op, optp->op, len) == 0) && (len == strlen (optp->op))) {