dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-25 12:31:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

common: command: trivial coding style fixes

Browse Source 
- Do not insert a whitespace between a function name and
   an open paranthesis
 - Fix comment style
 - Do not split an error message into multiple lines
   even if it exceeds 80 columns
 - Do not split "for" statement where it fits in 80 columns
 - Do not use assignment in if condition

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada
2014-10-23 17:27:30 +09:00
committed by Tom Rini
parent 5699ea6d0e
commit 616e2162a5
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
common/command.c
View File

@@ -18,13 +18,13 @@
* for long help messages * for long help messages
*/ */
int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int int _do_help(cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t *cmdtp, int flag,
flag, int argc, char * const argv[]) int argc, char * const argv[])
{ {
int i; int i;
int rcode = 0; int rcode = 0;
if (argc == 1) { /*show list of commands */ if (argc == 1) { /* show list of commands */
cmd_tbl_t *cmd_array[cmd_items]; cmd_tbl_t *cmd_array[cmd_items];
int i, j, swaps; int i, j, swaps;
@@ -38,8 +38,8 @@ int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int
for (i = cmd_items - 1; i > 0; --i) { for (i = cmd_items - 1; i > 0; --i) {
swaps = 0; swaps = 0;
for (j = 0; j < i; ++j) { for (j = 0; j < i; ++j) {
if (strcmp (cmd_array[j]->name, if (strcmp(cmd_array[j]->name,
cmd_array[j + 1]->name) > 0) { cmd_array[j + 1]->name) > 0) {
cmd_tbl_t *tmp; cmd_tbl_t *tmp;
tmp = cmd_array[j]; tmp = cmd_array[j];
cmd_array[j] = cmd_array[j + 1]; cmd_array[j] = cmd_array[j + 1];
@@ -56,7 +56,7 @@ int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int
const char *usage = cmd_array[i]->usage; const char *usage = cmd_array[i]->usage;
/* allow user abort */ /* allow user abort */
if (ctrlc ()) if (ctrlc())
return 1; return 1;
if (usage == NULL) if (usage == NULL)
continue; continue;
@@ -69,26 +69,23 @@ int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int
* command help (long version) * command help (long version)
*/ */
for (i = 1; i < argc; ++i) { for (i = 1; i < argc; ++i) {
if ((cmdtp = find_cmd_tbl (argv[i], cmd_start, cmd_items )) != NULL) { cmdtp = find_cmd_tbl(argv[i], cmd_start, cmd_items);
if (cmdtp != NULL) {
rcode |= cmd_usage(cmdtp); rcode |= cmd_usage(cmdtp);
} else { } else {
printf ("Unknown command '%s' - try 'help'" printf("Unknown command '%s' - try 'help' without arguments for list of all known commands\n\n",
" without arguments for list of all" argv[i]);
" known commands\n\n", argv[i]
);
rcode = 1; rcode = 1;
} }
} }
return rcode; return rcode;
} }
/*************************************************************************** /* find command table entry for a command */
* find command table entry for a command cmd_tbl_t *find_cmd_tbl(const char *cmd, cmd_tbl_t *table, int table_len)
*/
cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
{ {
cmd_tbl_t *cmdtp; cmd_tbl_t *cmdtp;
cmd_tbl_t *cmdtp_temp = table; /*Init value */ cmd_tbl_t *cmdtp_temp = table; /* Init value */
const char *p; const char *p;
int len; int len;
int n_found = 0; int n_found = 0;
@@ -101,11 +98,9 @@ cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
*/ */
len = ((p = strchr(cmd, '.')) == NULL) ? strlen (cmd) : (p - cmd); len = ((p = strchr(cmd, '.')) == NULL) ? strlen (cmd) : (p - cmd);
for (cmdtp = table; for (cmdtp = table; cmdtp != table + table_len; cmdtp++) {
cmdtp != table + table_len; if (strncmp(cmd, cmdtp->name, len) == 0) {
cmdtp++) { if (len == strlen(cmdtp->name))
if (strncmp (cmd, cmdtp->name, len) == 0) {
if (len == strlen (cmdtp->name))
return cmdtp; /* full match */ return cmdtp; /* full match */
cmdtp_temp = cmdtp; /* abbreviated command ? */ cmdtp_temp = cmdtp; /* abbreviated command ? */
@@ -119,7 +114,7 @@ cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table, int table_len)
return NULL; /* not found or ambiguous command */ return NULL; /* not found or ambiguous command */
} }
cmd_tbl_t *find_cmd (const char *cmd) cmd_tbl_t *find_cmd(const char *cmd)
{ {
cmd_tbl_t *start = ll_entry_start(cmd_tbl_t, cmd); cmd_tbl_t *start = ll_entry_start(cmd_tbl_t, cmd);
const int len = ll_entry_count(cmd_tbl_t, cmd); const int len = ll_entry_count(cmd_tbl_t, cmd);
@@ -138,8 +133,8 @@ int cmd_usage(const cmd_tbl_t *cmdtp)
return 1; return 1;
} }
puts (cmdtp->help); puts(cmdtp->help);
putc ('\n'); putc('\n');
#endif /* CONFIG_SYS_LONGHELP */ #endif /* CONFIG_SYS_LONGHELP */
return 1; return 1;
} }
@@ -194,7 +189,7 @@ static int complete_cmdv(int argc, char * const argv[], char last_char, int maxv
} }
/* more than one arg or one but the start of the next */ /* more than one arg or one but the start of the next */
if (argc > 1 || (last_char == '\0' || isblank(last_char))) { if (argc > 1 || last_char == '\0' || isblank(last_char)) {
cmdtp = find_cmd(argv[0]); cmdtp = find_cmd(argv[0]);
if (cmdtp == NULL || cmdtp->complete == NULL) { if (cmdtp == NULL || cmdtp->complete == NULL) {
cmdv[0] = NULL; cmdv[0] = NULL;
@@ -345,7 +340,8 @@ int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
argc = make_argv(tmp_buf, sizeof(argv)/sizeof(argv[0]), argv); argc = make_argv(tmp_buf, sizeof(argv)/sizeof(argv[0]), argv);
/* do the completion and return the possible completions */ /* do the completion and return the possible completions */
i = complete_cmdv(argc, argv, last_char, sizeof(cmdv)/sizeof(cmdv[0]), cmdv); i = complete_cmdv(argc, argv, last_char,
sizeof(cmdv) / sizeof(cmdv[0]), cmdv);
/* no match; bell and out */ /* no match; bell and out */
if (i == 0) { if (i == 0) {
@@ -365,7 +361,7 @@ int cmd_auto_complete(const char *const prompt, char *buf, int *np, int *colp)
len = strlen(s); len = strlen(s);
sep = " "; sep = " ";
seplen = 1; seplen = 1;
} else if (i > 1 && (j = find_common_prefix(cmdv)) != 0) { /* more */ } else if (i > 1 && (j = find_common_prefix(cmdv)) != 0) { /* more */
k = strlen(argv[argc - 1]); k = strlen(argv[argc - 1]);
j -= k; j -= k;
if (j > 0) { if (j > 0) {
@@ -414,7 +410,7 @@ int cmd_get_data_size(char* arg, int default_size)
*/ */
int len = strlen(arg); int len = strlen(arg);
if (len > 2 && arg[len-2] == '.') { if (len > 2 && arg[len-2] == '.') {
switch(arg[len-1]) { switch (arg[len-1]) {
case 'b': case 'b':
return 1; return 1;
case 'w': case 'w':
@@ -448,10 +444,10 @@ void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
ulong addr; ulong addr;
addr = (ulong) (cmdtp->cmd) + gd->reloc_off; addr = (ulong)(cmdtp->cmd) + gd->reloc_off;
#if DEBUG_COMMANDS #if DEBUG_COMMANDS
printf("Command \"%s\": 0x%08lx => 0x%08lx\n", printf("Command \"%s\": 0x%08lx => 0x%08lx\n",
cmdtp->name, (ulong) (cmdtp->cmd), addr); cmdtp->name, (ulong)(cmdtp->cmd), addr);
#endif #endif
cmdtp->cmd = cmdtp->cmd =
(int (*)(struct cmd_tbl_s *, int, int, char * const []))addr; (int (*)(struct cmd_tbl_s *, int, int, char * const []))addr;