Nearly complete rewrite of cgpt tool.

vboot_firmware/lib/cgptlib/cgptlib_internal.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.
  */
 
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "crc32.h"
 #include "gpt.h"
 #include "utility.h"
@@ skipping 39 matching lines @@
   if (h->revision != GPT_HEADER_REVISION)
     return 1;
   if (h->size < MIN_SIZE_OF_HEADER || h->size > MAX_SIZE_OF_HEADER)
     return 1;
 
   /* Check CRC before looking at remaining fields */
   if (HeaderCrc(h) != h->header_crc32)
     return 1;
 
   /* Reserved fields must be zero. */
-  if (h->reserved)
+  if (h->reserved_zero)
     return 1;
 
   /* TODO: Padding must be set to zero. */
 
   /* If entry size is different than our struct, we won't be able to
    * parse it.  Technically, any size 2^N where N>=7 is valid. */
   if (h->size_of_entry != sizeof(GptEntry))
     return 1;
   if ((h->number_of_entries < MIN_NUMBER_OF_ENTRIES) ||
       (h->number_of_entries > MAX_NUMBER_OF_ENTRIES) ||
@@ skipping 96 matching lines @@
  * my_lba
  * alternate_lba
  * entries_lba */
 int HeaderFieldsSame(GptHeader *h1, GptHeader *h2) {
   if (Memcmp(h1->signature, h2->signature, sizeof(h1->signature)))
     return 1;
   if (h1->revision != h2->revision)
     return 1;
   if (h1->size != h2->size)
     return 1;
-  if (h1->reserved != h2->reserved)
+  if (h1->reserved_zero != h2->reserved_zero)
     return 1;
   if (h1->first_usable_lba != h2->first_usable_lba)
     return 1;
   if (h1->last_usable_lba != h2->last_usable_lba)
     return 1;
   if (Memcmp(&h1->disk_uuid, &h2->disk_uuid, sizeof(Guid)))
     return 1;
   if (h1->number_of_entries != h2->number_of_entries)
     return 1;
   if (h1->size_of_entry != h2->size_of_entry)
@@ skipping 151 matching lines @@
   e->attributes |= ((uint64_t)priority << CGPT_ATTRIBUTE_PRIORITY_OFFSET) &
       CGPT_ATTRIBUTE_PRIORITY_MASK;
 }
 
 
 void SetEntryTries(GptEntry* e, int tries) {
   e->attributes &= ~CGPT_ATTRIBUTE_TRIES_MASK;
   e->attributes |= ((uint64_t)tries << CGPT_ATTRIBUTE_TRIES_OFFSET) &
       CGPT_ATTRIBUTE_TRIES_MASK;
 }