Cleanup option parsing for firmware signing utility.

src/platform/vboot_reference/utility/kernel_utility.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Utility for manipulating verified boot kernel images.
 //
 
 #include "kernel_utility.h"
 
-#include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <stdint.h>  // Needed for UINT16_MAX.
 #include <stdlib.h>
 #include <unistd.h>
 
 #include <iostream>
 
 extern "C" {
 #include "cryptolib.h"
 #include "file_keys.h"
 #include "kernel_image.h"
 #include "utility.h"
 }
 
-extern int errno;
 using std::cerr;
 
 namespace vboot_reference {
 
 KernelUtility::KernelUtility(): image_(NULL),
                                 firmware_key_pub_(NULL),
                                 header_version_(1),
                                 firmware_sign_algorithm_(-1),
                                 kernel_sign_algorithm_(-1),
                                 kernel_key_version_(-1),
@@ skipping 116 matching lines @@
     case OPT_FIRMWARE_SIGN_ALGORITHM:
       firmware_sign_algorithm_ = strtol(optarg, &e, 0);
       if (!*optarg || (e && *e)) {
         cerr << "Invalid argument to --"
              << long_options[option_index].name
              << ": " << optarg << "\n";
         return false;
       }
       break;
     case OPT_KERNEL_SIGN_ALGORITHM:
-      errno = 0;
       kernel_sign_algorithm_ = strtol(optarg, &e, 0);
       if (!*optarg || (e && *e)) {
         cerr << "Invalid argument to --"
              << long_options[option_index].name
              << ": " << optarg << "\n";
         return false;
       }
       break;
     case OPT_KERNEL_KEY_VERSION:
-      errno = 0;
       kernel_key_version_ = strtol(optarg, &e, 0);
       if (!*optarg || (e && *e)) {
         cerr << "Invalid argument to --"
              << long_options[option_index].name
              << ": " << optarg << "\n";
         return false;
       }
       break;
     case OPT_KERNEL_VERSION:
-      errno = 0;
       kernel_version_ = strtol(optarg, &e, 0);
       if (!*optarg || (e && *e)) {
         cerr << "Invalid argument to --"
              << long_options[option_index].name
              << ": " << optarg << "\n";
         return false;
       }
       break;
     case OPT_IN:
       in_file_ = optarg;
@@ skipping 226 matching lines @@
   }
   else if (ku.is_verify()) {
     cerr << "Verification ";
     if (ku.VerifySignedImage())
       cerr << "SUCCESS.\n";
     else
       cerr << "FAILURE.\n";
   }
   return 0;
 }