Skip to contentSkip to conversation

cmd_itest: constify & localize op table

PATCH New Mike Frysinger 2 participants 2 messages Oct 20, 2010 – Nov 28, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmd_itest: constify & localize op table

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

---
 common/cmd_itest.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
common/cmd_itest.c +3 -5
index 8dd8927..fa6a0c3 100644
@@ -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))) {
Signature · 1 line
1.7.3.1
#1 lore raw

PATCH 1/1 cmd_itest: constify & localize op table

Dear Mike Frysinger,

Quoted 7 lines · In message <[email protected]> you wrote:

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

---
 common/cmd_itest.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

Applied to "next" branch, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A direct quote from the Boss: "We passed over a lot of good people to
get the ones we hired."