projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
env: Add a baudrate env handler
[oweals/u-boot.git]
/
common
/
cmd_itest.c
diff --git
a/common/cmd_itest.c
b/common/cmd_itest.c
index 8dd8927b5803028111428eff00aafbb4b1b06260..2c8e5d05e141ddf936d2b4b6fdf122730ed600dc 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;
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 },
{ "-lt", LT },
{ "<" , LT },
{ "-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)
{
long l = 0;
static long evalexp(char *s, int w)
{
long l = 0;
@@
-96,16
+94,13
@@
static char * evalstr(char *s)
static int stringcomp(char *s, char *t, int op)
{
static int stringcomp(char *s, char *t, int op)
{
- int
n,
p;
+ int p;
char *l, *r;
l = evalstr(s);
r = evalstr(t);
char *l, *r;
l = evalstr(s);
r = evalstr(t);
- /* we'll do a compare based on the length of the shortest string */
- n = min(strlen(l), strlen(r));
-
- p = strncmp(l, r, n);
+ p = strcmp(l, r);
switch (op) {
case EQ: return (p == 0);
case NE: return (p != 0);
switch (op) {
case EQ: return (p == 0);
case NE: return (p != 0);
@@
-135,15
+130,15
@@
static int arithcomp (char *s, char *t, int op, int w)
return (0);
}
return (0);
}
-
int binary_test
(char *op, char *arg1, char *arg2, int w)
+
static 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);
for (optp = (op_tbl_t *)&op_table, i = 0;
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))) {
optp++, i++) {
if ((strncmp (op, optp->op, len) == 0) && (len == strlen (optp->op))) {
@@
-160,13
+155,13
@@
int binary_test (char *op, char *arg1, char *arg2, int w)
}
/* command line interface to the shell test */
}
/* command line interface to the shell test */
-
int do_itest ( cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
)
+
static int do_itest(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
)
{
int value, w;
/* Validate arguments */
if ((argc != 4))
{
int value, w;
/* Validate arguments */
if ((argc != 4))
- return
cmd_usage(cmdtp)
;
+ return
CMD_RET_USAGE
;
/* Check for a data width specification.
* Defaults to long (4) if no specification.
/* Check for a data width specification.
* Defaults to long (4) if no specification.