Nearly complete rewrite of cgpt tool.

tests/cgptlib_test.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 <string.h>
 
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
 #include "cgptlib_test.h"
@@ skipping 118 matching lines @@
   gpt->valid_headers = MASK_BOTH;
   gpt->valid_entries = MASK_BOTH;
   gpt->modified = 0;
 
   /* build primary */
   header = (GptHeader*)gpt->primary_header;
   entries = (GptEntry*)gpt->primary_entries;
   Memcpy(header->signature, GPT_HEADER_SIGNATURE,
          sizeof(GPT_HEADER_SIGNATURE));
   header->revision = GPT_HEADER_REVISION;
-  header->size = sizeof(GptHeader) - sizeof(header->padding);
-  header->reserved = 0;
+  header->size = sizeof(GptHeader);
+  header->reserved_zero = 0;
   header->my_lba = 1;
   header->alternate_lba = DEFAULT_DRIVE_SECTORS - 1;
   header->first_usable_lba = 34;
   header->last_usable_lba = DEFAULT_DRIVE_SECTORS - 1 - 32 - 1;  /* 433 */
   header->entries_lba = 2;
   header->number_of_entries = 128;  /* 512B / 128B * 32sectors = 128 entries */
   header->size_of_entry = 128;  /* bytes */
   Memcpy(&entries[0].type, &chromeos_kernel, sizeof(chromeos_kernel));
   entries[0].starting_lba = 34;
   entries[0].ending_lba = 133;
   Memcpy(&entries[1].type, &chromeos_rootfs, sizeof(chromeos_rootfs));
   entries[1].starting_lba = 134;
   entries[1].ending_lba = 232;
   Memcpy(&entries[2].type, &chromeos_rootfs, sizeof(chromeos_rootfs));
   entries[2].starting_lba = 234;
   entries[2].ending_lba = 331;
   Memcpy(&entries[3].type, &chromeos_kernel, sizeof(chromeos_kernel));
   entries[3].starting_lba = 334;
   entries[3].ending_lba = 430;
-  Memset(header->padding, 0, sizeof(header->padding));
 
   /* build secondary */
   header2 = (GptHeader*)gpt->secondary_header;
   entries2 = (GptEntry*)gpt->secondary_entries;
   Memcpy(header2, header, sizeof(GptHeader));
   Memcpy(entries2, entries, PARTITION_ENTRIES_SIZE);
   header2->my_lba = DEFAULT_DRIVE_SECTORS - 1;  /* 466 */
   header2->alternate_lba = 1;
   header2->entries_lba = DEFAULT_DRIVE_SECTORS - 1 - 32;  /* 434 */
 
@@ skipping 177 matching lines @@
 
 
 /* Tests if reserved fields are checked.
  * We'll try non-zero values to test. */
 static int ReservedFieldsTest() {
   GptData* gpt = GetEmptyGptData();
   GptHeader* h1 = (GptHeader*)gpt->primary_header;
   GptHeader* h2 = (GptHeader*)gpt->secondary_header;
 
   BuildTestGptData(gpt);
-  h1->reserved ^= 0x12345678;  /* whatever random */
-  h2->reserved ^= 0x12345678;  /* whatever random */
+  h1->reserved_zero ^= 0x12345678;  /* whatever random */
+  h2->reserved_zero ^= 0x12345678;  /* whatever random */
   RefreshCrc32(gpt);
   EXPECT(1 == CheckHeader(h1, 0, gpt->drive_sectors));
   EXPECT(1 == CheckHeader(h2, 1, gpt->drive_sectors));
 
 #ifdef PADDING_CHECKED
   /* TODO: padding check is currently disabled */
   BuildTestGptData(gpt);
   h1->padding[12] ^= 0x34;  /* whatever random */
   h2->padding[56] ^= 0x78;  /* whatever random */
   RefreshCrc32(gpt);
@@ skipping 762 matching lines @@
     printf(COL_RED "The following %d test cases are failed:\n" COL_STOP,
            error_count);
     for (i = 0; i < sizeof(test_cases)/sizeof(test_cases[0]); ++i) {
       if (test_cases[i].retval)
         printf("  %s()\n", test_cases[i].name);
     }
   }
 
   return (error_count) ? 1 : 0;
 }