diff options
author | Mike Frysinger <vapier@chromium.org> | 2014-08-18 10:47:42 -0400 |
---|---|---|
committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-08-20 08:23:45 +0000 |
commit | 7351ed7a3cf2759ac043d341d94f16e0ecd139f0 (patch) | |
tree | 1b0ac9204aaef326b8afa60fb91aeb84db1217c4 | |
parent | 277dc5274c5c906c8d80d2ae4cc7679d234e8408 (diff) | |
download | vboot-7351ed7a3cf2759ac043d341d94f16e0ecd139f0.tar.gz |
futility: add more static/const markings
BUG=chromium:404643
TEST=pre-cq passes (runs unittests)
BRANCH=None
Change-Id: I3c3a9ee7192305dfa72333c0b6a77653b7188869
Reviewed-on: https://chromium-review.googlesource.com/212877
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
-rw-r--r-- | futility/cmd_dev_sign_file.c | 4 | ||||
-rw-r--r-- | futility/cmd_dump_kernel_config.c | 4 | ||||
-rw-r--r-- | futility/cmd_gbb_utility.c | 2 | ||||
-rw-r--r-- | futility/cmd_vbutil_firmware.c | 4 | ||||
-rw-r--r-- | futility/cmd_vbutil_kernel.c | 4 | ||||
-rw-r--r-- | futility/cmd_vbutil_key.c | 4 | ||||
-rw-r--r-- | futility/cmd_vbutil_keyblock.c | 4 | ||||
-rw-r--r-- | futility/futility.c | 6 | ||||
-rw-r--r-- | futility/futility.h | 14 |
9 files changed, 23 insertions, 23 deletions
diff --git a/futility/cmd_dev_sign_file.c b/futility/cmd_dev_sign_file.c index 3b2b640b..f377ff47 100644 --- a/futility/cmd_dev_sign_file.c +++ b/futility/cmd_dev_sign_file.c @@ -36,7 +36,7 @@ enum { OPT_VBLOCK, }; -static struct option long_opts[] = { +static const struct option long_opts[] = { {"sign", 1, 0, OPT_MODE_SIGN }, {"verify", 1, 0, OPT_MODE_VERIFY }, {"keyblock", 1, 0, OPT_KEYBLOCK }, @@ -274,7 +274,7 @@ static int Verify(const char* filename, const char* vblock_file, } -int do_dev_sign_file(int argc, char* argv[]) { +static int do_dev_sign_file(int argc, char* argv[]) { char* filename = NULL; char* keyblock_file = NULL; char* signprivate_file = NULL; diff --git a/futility/cmd_dump_kernel_config.c b/futility/cmd_dump_kernel_config.c index 2d15f99f..a6e987e2 100644 --- a/futility/cmd_dump_kernel_config.c +++ b/futility/cmd_dump_kernel_config.c @@ -18,7 +18,7 @@ enum { OPT_KLOADADDR = 1000, }; -static struct option long_opts[] = { +static const struct option long_opts[] = { { "kloadaddr", 1, NULL, OPT_KLOADADDR }, { NULL, 0, NULL, 0 } }; @@ -34,7 +34,7 @@ static int PrintHelp(void) { return 1; } -int do_dump_kernel_config(int argc, char* argv[]) { +static int do_dump_kernel_config(int argc, char* argv[]) { char *infile = NULL; char *config = NULL; uint64_t kernel_body_load_address = USE_PREAMBLE_LOAD_ADDR; diff --git a/futility/cmd_gbb_utility.c b/futility/cmd_gbb_utility.c index a8554562..966b7445 100644 --- a/futility/cmd_gbb_utility.c +++ b/futility/cmd_gbb_utility.c @@ -53,7 +53,7 @@ static void help_and_quit(const char *prog) { } /* Command line options */ -static struct option long_opts[] = { +static const struct option long_opts[] = { /* name hasarg *flag val */ {"get", 0, NULL, 'g' }, {"set", 0, NULL, 's' }, diff --git a/futility/cmd_vbutil_firmware.c b/futility/cmd_vbutil_firmware.c index b58fa2be..7eea6c84 100644 --- a/futility/cmd_vbutil_firmware.c +++ b/futility/cmd_vbutil_firmware.c @@ -33,7 +33,7 @@ enum { OPT_FLAGS, }; -static struct option long_opts[] = { +static const struct option long_opts[] = { {"vblock", 1, 0, OPT_MODE_VBLOCK }, {"verify", 1, 0, OPT_MODE_VERIFY }, {"keyblock", 1, 0, OPT_KEYBLOCK }, @@ -291,7 +291,7 @@ static int Verify(const char* infile, const char* signpubkey, } -int do_vbutil_firmware(int argc, char* argv[]) { +static int do_vbutil_firmware(int argc, char* argv[]) { char* filename = NULL; char* key_block_file = NULL; diff --git a/futility/cmd_vbutil_kernel.c b/futility/cmd_vbutil_kernel.c index d62f72dc..91d0220d 100644 --- a/futility/cmd_vbutil_kernel.c +++ b/futility/cmd_vbutil_kernel.c @@ -61,7 +61,7 @@ typedef enum { ARCH_MIPS } arch_t; -static struct option long_opts[] = { +static const struct option long_opts[] = { {"pack", 1, 0, OPT_MODE_PACK }, {"repack", 1, 0, OPT_MODE_REPACK }, {"verify", 1, 0, OPT_MODE_VERIFY }, @@ -696,7 +696,7 @@ static int Verify(uint8_t* kernel_blob, /****************************************************************************/ -int do_vbutil_kernel(int argc, char* argv[]) { +static int do_vbutil_kernel(int argc, char* argv[]) { char* filename = NULL; char* oldfile = NULL; char* keyblock_file = NULL; diff --git a/futility/cmd_vbutil_key.c b/futility/cmd_vbutil_key.c index 56b224c6..88d8e83b 100644 --- a/futility/cmd_vbutil_key.c +++ b/futility/cmd_vbutil_key.c @@ -29,7 +29,7 @@ enum { OPT_COPYTO, }; -static struct option long_opts[] = { +static const struct option long_opts[] = { {"key", 1, 0, OPT_INKEY }, {"version", 1, 0, OPT_KEY_VERSION }, {"algorithm", 1, 0, OPT_ALGORITHM }, @@ -163,7 +163,7 @@ static int Unpack(const char *infile, const char *outfile) { } -int do_vbutil_key(int argc, char* argv[]) { +static int do_vbutil_key(int argc, char* argv[]) { char *infile = NULL; char *outfile = NULL; diff --git a/futility/cmd_vbutil_keyblock.c b/futility/cmd_vbutil_keyblock.c index d15afd89..687537d8 100644 --- a/futility/cmd_vbutil_keyblock.c +++ b/futility/cmd_vbutil_keyblock.c @@ -31,7 +31,7 @@ enum { OPT_FLAGS, }; -static struct option long_opts[] = { +static const struct option long_opts[] = { {"pack", 1, 0, OPT_MODE_PACK }, {"unpack", 1, 0, OPT_MODE_UNPACK }, {"datapubkey", 1, 0, OPT_DATAPUBKEY }, @@ -214,7 +214,7 @@ static int Unpack(const char* infile, const char* datapubkey, } -int do_vbutil_keyblock(int argc, char* argv[]) { +static int do_vbutil_keyblock(int argc, char* argv[]) { char* filename = NULL; char* datapubkey = NULL; diff --git a/futility/futility.c b/futility/futility.c index deef3061..a16beeb1 100644 --- a/futility/futility.c +++ b/futility/futility.c @@ -45,7 +45,7 @@ In either case it will append some usage information to " LOGFILE "\n\ static int do_help(int argc, char *argv[]) { - struct futil_cmd_t **cmd; + const struct futil_cmd_t * const *cmd; int i; fputs(usage, stdout); @@ -71,7 +71,7 @@ DECLARE_FUTIL_COMMAND(help, do_help, * These are built-in functions that we'd like to abandon completely someday. * TODO: If no one complains, get rid of them. */ -static char *dep_cmds[] = { +static const char * const dep_cmds[] = { "dev_sign_file", }; @@ -220,7 +220,7 @@ int main(int argc, char *argv[], char *envp[]) char buf[80]; pid_t myproc; ssize_t r; - struct futil_cmd_t **cmd; + const struct futil_cmd_t * const *cmd; int i; int via_symlink = 0; diff --git a/futility/futility.h b/futility/futility.h index a1417c01..387c7156 100644 --- a/futility/futility.h +++ b/futility/futility.h @@ -11,7 +11,7 @@ /* Here's a structure to define the commands that futility implements. */ struct futil_cmd_t { const char * const name; - int (*handler)(int argc, char **argv); + int (*const handler)(int argc, char **argv); const char * const shorthelp; }; @@ -23,17 +23,17 @@ struct futil_cmd_t { * to them without explictly declaring every function in a header somewhere. */ #define DECLARE_FUTIL_COMMAND(NAME, HANDLER, SHORTHELP) \ - static struct futil_cmd_t cmd_##NAME = { \ + static const struct futil_cmd_t __cmd_##NAME = { \ .name = #NAME, \ .handler = HANDLER, \ .shorthelp = SHORTHELP \ - }; \ - const struct futil_cmd_t *__cmd_ptr_##NAME \ - __attribute__((section(".futil_cmds." #NAME))) \ - = &cmd_##NAME + }; \ + const struct futil_cmd_t * const __cmd_ptr_##NAME \ + __attribute__((section(".futil_cmds." #NAME))) \ + = &__cmd_##NAME /* This is the list of pointers to all commands. */ -extern struct futil_cmd_t *futil_cmds[]; +extern const struct futil_cmd_t * const futil_cmds[]; /* Size of an array */ #ifndef ARRAY_SIZE |