Patchwork [U-Boot] cmd_itest: constify & localize op table

login
register
mail settings
Submitter Mike Frysinger
Date Oct. 20, 2010, 11:17 a.m.
Message ID <1287573453-6619-1-git-send-email-vapier@gentoo.org>
Download mbox | patch
Permalink /patch/71903/
State Accepted
Commit fc9903f38d53024e28261eb14230bf6fc02d879e
Delegated to: Wolfgang Denk
Headers show

Comments

Mike Frysinger - Oct. 20, 2010, 11:17 a.m.
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>
---
 common/cmd_itest.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
Wolfgang Denk - Nov. 28, 2010, 9:02 p.m.
Dear Mike Frysinger,

In message <1287573453-6619-1-git-send-email-vapier@gentoo.org> you wrote:
> 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>
> ---
>  common/cmd_itest.c |    8 +++-----
>  1 files changed, 3 insertions(+), 5 deletions(-)

Applied to "next" branch, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/common/cmd_itest.c b/common/cmd_itest.c
index 8dd8927..fa6a0c3 100644
--- 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))) {