Require -Wall -Werror for everything.

BUG=none
TEST=none

Change-Id: Ib9781238274285f73d00d8fca4ecda28fc2c6678
Reviewed-on: https://gerrit.chromium.org/gerrit/21748
Commit-Ready: Bill Richardson <wfrichar@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>

4 files changed, 5 insertions, 16 deletions

diff --git a/utility/dump_fmap.c b/utility/dump_fmap.c
index daffdf3b..d4a3eb1c 100644
--- a/utility/dump_fmap.c
+++ b/utility/dump_fmap.c
@@ -28,7 +28,7 @@ static void* base_of_rom;
 
 /* Return 0 if successful */
 static int dump_fmap(const void* ptr, int argc, char *argv[]) {
-  int i,j,retval = 0;
+  int i, retval = 0;
   char buf[80];                         // DWR: magic number
   const FmapHeader* fmh = (const FmapHeader*) ptr;
   const FmapAreaHeader* ah = (const FmapAreaHeader*) (ptr + sizeof(FmapHeader));
diff --git a/utility/dump_kernel_config.c b/utility/dump_kernel_config.c
index b01aedb8..a6989e1c 100644
--- a/utility/dump_kernel_config.c
+++ b/utility/dump_kernel_config.c
@@ -5,20 +5,19 @@
  * Exports the kernel commandline from a given partition/image.
  */
 
-#include "dump_kernel_config.h"
-
 #include <stdio.h>
 #include <sys/mman.h>
 
+#include "dump_kernel_config.h"
 #include "host_common.h"
 #include "kernel_blob.h"
+#include "vboot_api.h"
 
 uint8_t* find_kernel_config(uint8_t* blob, uint64_t blob_size,
                             uint64_t kernel_body_load_address) {
 
   VbKeyBlockHeader* key_block;
   VbKernelPreambleHeader* preamble;
-  struct linux_kernel_params *params;
   uint32_t now = 0;
   uint32_t offset = 0;
 
diff --git a/utility/dump_kernel_config_main.c b/utility/dump_kernel_config_main.c
index ed77f879..20a51871 100644
--- a/utility/dump_kernel_config_main.c
+++ b/utility/dump_kernel_config_main.c
@@ -5,14 +5,15 @@
  * Exports the kernel commandline from a given partition/image.
  */
 
-#include "dump_kernel_config.h"
 
 #include <getopt.h>
 #include <stdio.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
+#include "dump_kernel_config.h"
 #include "kernel_blob.h"
+#include "vboot_api.h"
 
 enum {
   OPT_KLOADADDR = 1000,
diff --git a/utility/vbutil_kernel.c b/utility/vbutil_kernel.c
index f75d8a7c..29d508a0 100644
--- a/utility/vbutil_kernel.c
+++ b/utility/vbutil_kernel.c
@@ -158,15 +158,6 @@ static void Fatal(const char *format, ...) {
   exit(1);
 }
 
-static void Warning(const char *format, ...) {
-  va_list ap;
-  va_start(ap, format);
-  fprintf(stderr, "WARNING: ");
-  vfprintf(stderr, format, ap);
-  va_end(ap);
-}
-
-
 /* Return an explanation when fread() fails. */
 static const char *error_fread(FILE *fp) {
   const char *retval = "beats me why";
@@ -451,7 +442,6 @@ static void UnpackKernelBlob(uint8_t *kernel_blob_data,
     g_preamble->body_load_address;
   uint64_t p_ofs = b_ofs - CROS_CONFIG_SIZE;
   uint64_t c_ofs = p_ofs - CROS_PARAMS_SIZE;
-  uint64_t k_size = c_ofs;
 
   Debug("k_blob_size    = 0x%" PRIx64 "\n", k_blob_size   );
   Debug("k_blob_ofs     = 0x%" PRIx64 "\n", k_blob_ofs    );
@@ -536,7 +526,6 @@ static int Pack(const char* outfile,
                 uint64_t kernel_body_load_address,
                 VbPrivateKey* signpriv_key) {
   VbSignature* body_sig;
-  uint64_t key_block_size;
   FILE* f;
   uint64_t i;
   uint64_t written = 0;