vboot_reference: Rename *_SECTOR to *_SECTORS

This CL renames GPT_PMBR_SECTOR to GPT_PMBR_SECTORS and GPT_HEADER_SECTOR to
GPT_HEADER_SECTORS to better indicate that these are constants for sizes, not
location.

BRANCH=None
BUG=None
TEST=unittest

Change-Id: I26ed6d45d77dcb1eb714135edbb9e4124b54e953
Reviewed-on: https://chromium-review.googlesource.com/214830
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: Nam Nguyen <namnguyen@chromium.org>
Commit-Queue: Nam Nguyen <namnguyen@chromium.org>

3 files changed, 25 insertions, 25 deletions

diff --git a/cgpt/cgpt_common.c b/cgpt/cgpt_common.c
index 44652a37..9eb99504 100644
--- a/cgpt/cgpt_common.c
+++ b/cgpt/cgpt_common.c
@@ -309,13 +309,13 @@ static int GptLoad(struct drive *drive, uint32_t sector_bytes) {
 
   // Read the data.
   if (CGPT_OK != Load(drive, &drive->gpt.primary_header,
-                      GPT_PMBR_SECTOR,
-                      drive->gpt.sector_bytes, GPT_HEADER_SECTOR)) {
+                      GPT_PMBR_SECTORS,
+                      drive->gpt.sector_bytes, GPT_HEADER_SECTORS)) {
     return -1;
   }
   if (CGPT_OK != Load(drive, &drive->gpt.secondary_header,
-                      drive->gpt.drive_sectors - GPT_PMBR_SECTOR,
-                      drive->gpt.sector_bytes, GPT_HEADER_SECTOR)) {
+                      drive->gpt.drive_sectors - GPT_PMBR_SECTORS,
+                      drive->gpt.sector_bytes, GPT_HEADER_SECTORS)) {
     return -1;
   }
   GptHeader* primary_header = (GptHeader*)drive->gpt.primary_header;
@@ -337,8 +337,8 @@ static int GptSave(struct drive *drive) {
   int errors = 0;
   if (drive->gpt.modified & GPT_MODIFIED_HEADER1) {
     if (CGPT_OK != Save(drive, drive->gpt.primary_header,
-                        GPT_PMBR_SECTOR,
-                        drive->gpt.sector_bytes, GPT_HEADER_SECTOR)) {
+                        GPT_PMBR_SECTORS,
+                        drive->gpt.sector_bytes, GPT_HEADER_SECTORS)) {
       errors++;
       Error("Cannot write primary header: %s\n", strerror(errno));
     }
@@ -346,8 +346,8 @@ static int GptSave(struct drive *drive) {
 
   if (drive->gpt.modified & GPT_MODIFIED_HEADER2) {
     if(CGPT_OK != Save(drive, drive->gpt.secondary_header,
-                       drive->gpt.drive_sectors - GPT_PMBR_SECTOR,
-                       drive->gpt.sector_bytes, GPT_HEADER_SECTOR)) {
+                       drive->gpt.drive_sectors - GPT_PMBR_SECTORS,
+                       drive->gpt.sector_bytes, GPT_HEADER_SECTORS)) {
       errors++;
       Error("Cannot write secondary header: %s\n", strerror(errno));
     }
@@ -1155,10 +1155,10 @@ uint8_t RepairHeader(GptData *gpt, const uint32_t valid_headers) {
     return GPT_MODIFIED_HEADER2;
   } else if (valid_headers == MASK_SECONDARY) {
     memcpy(primary_header, secondary_header, sizeof(GptHeader));
-    primary_header->my_lba = GPT_PMBR_SECTOR;  /* the second sector on drive */
+    primary_header->my_lba = GPT_PMBR_SECTORS;  /* the second sector on drive */
     primary_header->alternate_lba = secondary_header->my_lba;
     /* TODO (namnguyen): Preserve (header, entries) padding space. */
-    primary_header->entries_lba = primary_header->my_lba + GPT_HEADER_SECTOR;
+    primary_header->entries_lba = primary_header->my_lba + GPT_HEADER_SECTORS;
     return GPT_MODIFIED_HEADER1;
   }
 
diff --git a/cgpt/cgpt_create.c b/cgpt/cgpt_create.c
index c9134da6..cec60778 100644
--- a/cgpt/cgpt_create.c
+++ b/cgpt/cgpt_create.c
@@ -12,9 +12,9 @@
 static int GptCreate(struct drive *drive, CgptCreateParams *params) {
   // Erase the data
   memset(drive->gpt.primary_header, 0,
-         drive->gpt.sector_bytes * GPT_HEADER_SECTOR);
+         drive->gpt.sector_bytes * GPT_HEADER_SECTORS);
   memset(drive->gpt.secondary_header, 0,
-         drive->gpt.sector_bytes * GPT_HEADER_SECTOR);
+         drive->gpt.sector_bytes * GPT_HEADER_SECTORS);
   memset(drive->gpt.primary_entries, 0,
          drive->gpt.sector_bytes * GPT_ENTRIES_SECTORS);
   memset(drive->gpt.secondary_entries, 0,
@@ -29,11 +29,11 @@ static int GptCreate(struct drive *drive, CgptCreateParams *params) {
     memcpy(h->signature, GPT_HEADER_SIGNATURE, GPT_HEADER_SIGNATURE_SIZE);
     h->revision = GPT_HEADER_REVISION;
     h->size = sizeof(GptHeader);
-    h->my_lba = GPT_PMBR_SECTOR;  /* The second sector on drive. */
-    h->alternate_lba = drive->gpt.drive_sectors - GPT_HEADER_SECTOR;
-    h->entries_lba = h->my_lba + GPT_HEADER_SECTOR + params->padding;
+    h->my_lba = GPT_PMBR_SECTORS;  /* The second sector on drive. */
+    h->alternate_lba = drive->gpt.drive_sectors - GPT_HEADER_SECTORS;
+    h->entries_lba = h->my_lba + GPT_HEADER_SECTORS + params->padding;
     h->first_usable_lba = h->entries_lba + GPT_ENTRIES_SECTORS;
-    h->last_usable_lba = (drive->gpt.drive_sectors - GPT_HEADER_SECTOR -
+    h->last_usable_lba = (drive->gpt.drive_sectors - GPT_HEADER_SECTORS -
                           GPT_ENTRIES_SECTORS - 1);
     if (CGPT_OK != GenerateGuid(&h->disk_uuid)) {
       Error("Unable to generate new GUID.\n");
diff --git a/cgpt/cgpt_show.c b/cgpt/cgpt_show.c
index 3603770b..4788bfd9 100644
--- a/cgpt/cgpt_show.c
+++ b/cgpt/cgpt_show.c
@@ -394,14 +394,14 @@ static int GptShow(struct drive *drive, CgptShowParams *params) {
     printf(TITLE_FMT, "start", "size", "part", "contents");
     char buf[256];                      // buffer for formatted PMBR content
     PMBRToStr(&drive->pmbr, buf, sizeof(buf)); // will exit if buf is too small
-    printf(GPT_FMT, 0, GPT_PMBR_SECTOR, "", buf);
+    printf(GPT_FMT, 0, GPT_PMBR_SECTORS, "", buf);
 
     if (drive->gpt.valid_headers & MASK_PRIMARY) {
-      printf(GPT_FMT, (int)GPT_PMBR_SECTOR,
-             (int)GPT_HEADER_SECTOR, "", "Pri GPT header");
+      printf(GPT_FMT, (int)GPT_PMBR_SECTORS,
+             (int)GPT_HEADER_SECTORS, "", "Pri GPT header");
     } else {
-      printf(GPT_FMT, (int)GPT_PMBR_SECTOR,
-             (int)GPT_HEADER_SECTOR, "INVALID", "Pri GPT header");
+      printf(GPT_FMT, (int)GPT_PMBR_SECTORS,
+             (int)GPT_HEADER_SECTORS, "INVALID", "Pri GPT header");
     }
 
     if (params->debug ||
@@ -445,11 +445,11 @@ static int GptShow(struct drive *drive, CgptShowParams *params) {
     }
 
     if (drive->gpt.valid_headers & MASK_SECONDARY)
-      printf(GPT_FMT, (int)(drive->gpt.drive_sectors - GPT_HEADER_SECTOR),
-             (int)GPT_HEADER_SECTOR, "", "Sec GPT header");
+      printf(GPT_FMT, (int)(drive->gpt.drive_sectors - GPT_HEADER_SECTORS),
+             (int)GPT_HEADER_SECTORS, "", "Sec GPT header");
     else
-      printf(GPT_FMT, (int)GPT_PMBR_SECTOR,
-             (int)GPT_HEADER_SECTOR, "INVALID", "Sec GPT header");
+      printf(GPT_FMT, (int)GPT_PMBR_SECTORS,
+             (int)GPT_HEADER_SECTORS, "INVALID", "Sec GPT header");
     /* We show secondary header if any of following is true:
      *   1. in debug mode.
      *   2. only secondary is valid.