diff options
| author | Nam T. Nguyen <namnguyen@chromium.org> | 2014-08-28 10:58:47 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-08-29 21:56:20 +0000 |
| commit | 88458d9b5281aca162821a369707781ac9abb44e (patch) | |
| tree | f6cab5e07a797941a52c9e72b75a5665a2a442b0 /cgpt/cgpt_common.c | |
| parent | c0777be638d0cb69caa4e6a8d1573c78435f1865 (diff) | |
| download | vboot-88458d9b5281aca162821a369707781ac9abb44e.tar.gz | |
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>
Diffstat (limited to 'cgpt/cgpt_common.c')
| -rw-r--r-- | cgpt/cgpt_common.c | 20 |
1 files changed, 10 insertions, 10 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; } |