diff options
| author | Simon Glass | 2020-05-10 11:40:03 -0600 |
|---|---|---|
| committer | Tom Rini | 2020-05-18 18:36:55 -0400 |
| commit | 09140113108541b95d340f3c7b6ee597d31ccc73 (patch) | |
| tree | 4b4241b799bbbb2eeef4164392442b193af1703f /lib | |
| parent | 691d719db7183dfb1d1360efed4c5e9f6899095f (diff) | |
command: Remove the cmd_tbl_t typedef
We should not use typedefs in U-Boot. They cannot be used as forward
declarations which means that header files must include the full header to
access them.
Drop the typedef and rename the struct to remove the _s suffix which is
now not useful.
This requires quite a few header-file additions.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dhry/cmd_dhry.c | 3 | ||||
| -rw-r--r-- | lib/efi_loader/efi_variable.c | 1 | ||||
| -rw-r--r-- | lib/fdtdec_test.c | 5 | ||||
| -rw-r--r-- | lib/hashtable.c | 2 | ||||
| -rw-r--r-- | lib/uuid.c | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/lib/dhry/cmd_dhry.c b/lib/dhry/cmd_dhry.c index 29504833efb..d55ab54df97 100644 --- a/lib/dhry/cmd_dhry.c +++ b/lib/dhry/cmd_dhry.c @@ -8,7 +8,8 @@ #include <div64.h> #include "dhry.h" -static int do_dhry(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +static int do_dhry(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { ulong start, duration, vax_mips; u64 dhry_per_sec; diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 04080794caf..85db96bd147 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -7,6 +7,7 @@ #include <common.h> #include <efi_loader.h> +#include <env.h> #include <env_internal.h> #include <hexdump.h> #include <malloc.h> diff --git a/lib/fdtdec_test.c b/lib/fdtdec_test.c index e8bfd1fb1ec..e0c6e0971cd 100644 --- a/lib/fdtdec_test.c +++ b/lib/fdtdec_test.c @@ -7,6 +7,7 @@ */ #include <common.h> +#include <command.h> #include <fdtdec.h> #include <linux/libfdt.h> #include <malloc.h> @@ -297,8 +298,8 @@ static int check_carveout(void) return 0; } -static int do_test_fdtdec(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) +static int do_test_fdtdec(struct cmd_tbl *cmdtp, int flag, int argc, + char *const argv[]) { /* basic tests */ CHECKOK(run_test("", "", "")); diff --git a/lib/hashtable.c b/lib/hashtable.c index f82f2463cf2..e3be5635651 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -605,7 +605,7 @@ static int match_entry(struct env_entry *ep, int flag, int argc, ssize_t hexport_r(struct hsearch_data *htab, const char sep, int flag, char **resp, size_t size, - int argc, char * const argv[]) + int argc, char *const argv[]) { struct env_entry *list[htab->size]; char *res, *p; diff --git a/lib/uuid.c b/lib/uuid.c index f94c6abd297..e62d5ca2643 100644 --- a/lib/uuid.c +++ b/lib/uuid.c @@ -4,6 +4,7 @@ */ #include <common.h> +#include <command.h> #include <env.h> #include <rand.h> #include <time.h> @@ -286,7 +287,7 @@ void gen_rand_uuid_str(char *uuid_str, int str_format) } #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_CMD_UUID) -int do_uuid(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +int do_uuid(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { char uuid[UUID_STR_LEN + 1]; int str_format; |