projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: ks8851: Clean up chip ID readout
[oweals/u-boot.git]
/
common
/
cli_hush.c
diff --git
a/common/cli_hush.c
b/common/cli_hush.c
index 955e8fe53675a7130349625fa016f95a2fcc67af..5b1f11907438e893911ca6f8e0650be8a423392c 100644
(file)
--- a/
common/cli_hush.c
+++ b/
common/cli_hush.c
@@
-75,9
+75,10
@@
#define __U_BOOT__
#ifdef __U_BOOT__
#define __U_BOOT__
#ifdef __U_BOOT__
+#include <common.h> /* readline */
+#include <env.h>
#include <malloc.h> /* malloc, free, realloc*/
#include <linux/ctype.h> /* isalpha, isdigit */
#include <malloc.h> /* malloc, free, realloc*/
#include <linux/ctype.h> /* isalpha, isdigit */
-#include <common.h> /* readline */
#include <console.h>
#include <bootretry.h>
#include <cli.h>
#include <console.h>
#include <bootretry.h>
#include <cli.h>
@@
-1848,8
+1849,7
@@
static int run_list_real(struct pipe *pi)
continue;
} else {
/* insert new value from list for variable */
continue;
} else {
/* insert new value from list for variable */
- if (pi->progs->argv[0])
- free(pi->progs->argv[0]);
+ free(pi->progs->argv[0]);
pi->progs->argv[0] = *list++;
#ifndef __U_BOOT__
pi->progs->glob_result.gl_pathv[0] =
pi->progs->argv[0] = *list++;
#ifndef __U_BOOT__
pi->progs->glob_result.gl_pathv[0] =
@@
-3664,8
+3664,8
@@
static char *make_string(char **inp, int *nonnull)
}
#ifdef __U_BOOT__
}
#ifdef __U_BOOT__
-static int do_showvar(
cmd_tbl_t
*cmdtp, int flag, int argc,
- char *
const argv[])
+static int do_showvar(
struct cmd_tbl
*cmdtp, int flag, int argc,
+ char *const argv[])
{
int i, k;
int rcode = 0;
{
int i, k;
int rcode = 0;