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>

diff --git a/common/cmd_itest.c b/common/cmd_itest.c
index 8dd8927b5803028111428eff00aafbb4b1b06260..fa6a0c30113216df21d96e5bb3075cf9a849d5aa 100644 (file)
--- a/common/cmd_itest.c
+++ b/common/cmd_itest.c
@@ -46,7 +46,7 @@ struct op_tbl_s {
 
 typedef struct op_tbl_s op_tbl_t;
 
-op_tbl_t op_table [] = {
+static const op_tbl_t op_table [] = {
        { "-lt", LT },
        { "<"  , LT },
        { "-gt", GT },
@@ -62,8 +62,6 @@ op_tbl_t op_table [] = {
        { "<=" , LE },
 };
 
-#define op_tbl_size (sizeof(op_table)/sizeof(op_table[0]))
-
 static long evalexp(char *s, int w)
 {
        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 len, i;
-       op_tbl_t *optp;
+       const op_tbl_t *optp;
 
        len = strlen(op);
 
        for (optp = (op_tbl_t *)&op_table, i = 0;
-            i < op_tbl_size;
+            i < ARRAY_SIZE(op_table);
             optp++, i++) {
 
                if ((strncmp (op, optp->op, len) == 0) && (len == strlen (optp->op))) {