Much rearranging of cgptlib. Passes all its (new) unit tests.

src/platform/vboot_reference/utility/cgpt/cgpt_attribute.c

 /* 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.
  *
  * Update GPT attribute bits.
  */
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "cgpt.h"
 #include "cgptlib_internal.h"
+#include "cgpt_tofix.h"
 #include "utility.h"
 
 static struct number_range
     range_1_0 = {1, 0},
     range_15_0 = {15, 0};
 
 /* Integers to store parsed argument. */
 static int help, partition, bad, successful, tries, priority;
 
 /* The structure for getopt_long(). When you add/delete any line, please refine
@@ skipping 97 matching lines @@
       printf("[ERROR] No ChromeOS kernel is found. "
              "Please use --partition to specify.\n");
       return CGPT_FAILED;
     } else {
       debug("No --partition is specified. "
             "Found the first ChromeOS kernel at index [%d].\n",
             partition);
     }
   }
 
-  if (bad != NOT_INITED)
-    SetBad(&drive.gpt, PRIMARY, partition, bad);
   if (successful != NOT_INITED)
     SetSuccessful(&drive.gpt, PRIMARY, partition, successful);
   if (tries != NOT_INITED)
     SetTries(&drive.gpt, PRIMARY, partition, tries);
   if (priority != NOT_INITED)
     SetPriority(&drive.gpt, PRIMARY, partition, priority);
 
   /* Claims primary is good, then secondary will be overwritten. */
+  /* TODO: rspangler broke this during cgptlib refactoring; need to
+   * update this to match new internal APIs. */
   RepairEntries(&drive.gpt, MASK_PRIMARY);
   RepairHeader(&drive.gpt, MASK_PRIMARY);
+
   /* Forces headers and entries are modified so that CRC32 will be re-calculated
    * and headers and entries will be updated to drive. */
   drive.gpt.modified |= (GPT_MODIFIED_HEADER1 | GPT_MODIFIED_ENTRIES1 |
                          GPT_MODIFIED_HEADER2 | GPT_MODIFIED_ENTRIES2);
   UpdateCrc(&drive.gpt);
   DriveClose(&drive);
 
   return CGPT_OK;
 }