From 88458d9b5281aca162821a369707781ac9abb44e Mon Sep 17 00:00:00 2001 From: "Nam T. Nguyen" Date: Thu, 28 Aug 2014 10:58:47 -0700 Subject: 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 Tested-by: Nam Nguyen Commit-Queue: Nam Nguyen --- cgpt/cgpt_show.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cgpt/cgpt_show.c') 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. -- cgit v1.2.1