Refactor CgptAdd and CgptPrioitize to remove gpt-specific code

- Refactor cgpt_prioitize.c to completely remove gpt-specific code.
- Refactor cgpt_add.c to isolate gpt-dependence to one helper function
and the backup/restore logic
- Change several common apis to take a struct drive* rather than a GptData*,
this provides a path to cleanly implement mtd versions

BUG=chromium:221745
TEST=no functional changes, existing tests cover this
BRANCH=none

Change-Id: I27ed166aae390aa5dc83062f62939e45122edc76
Original-Change-Id: I1b0a73509efbf22411c4ae5cf044feede0a49a33
Reviewed-on: https://gerrit.chromium.org/gerrit/46548
Tested-by: Albert Chaulk <achaulk@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Commit-Queue: Albert Chaulk <achaulk@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/49788

1 files changed, 11 insertions, 11 deletions

diff --git a/cgpt/cgpt_show.c b/cgpt/cgpt_show.c
index cb5e2759..351c9cef 100644
--- a/cgpt/cgpt_show.c
+++ b/cgpt/cgpt_show.c
@@ -150,12 +150,12 @@ void EntryDetails(GptEntry *entry, uint32_t index, int raw) {
 }
 
 
-void EntriesDetails(GptData *gpt, const int secondary, int raw) {
+void EntriesDetails(struct drive *drive, const int secondary, int raw) {
   uint32_t i;
 
-  for (i = 0; i < GetNumberOfEntries(gpt); ++i) {
+  for (i = 0; i < GetNumberOfEntries(drive); ++i) {
     GptEntry *entry;
-    entry = GetEntry(gpt, secondary, i);
+    entry = GetEntry(&drive->gpt, secondary, i);
 
     if (GuidIsZero(&entry->type))
       continue;
@@ -183,7 +183,7 @@ int CgptGetNumNonEmptyPartitions(CgptShowParams *params) {
   }
 
   params->num_partitions = 0;
-  int numEntries = GetNumberOfEntries(&drive.gpt);
+  int numEntries = GetNumberOfEntries(&drive);
   int i;
   for(i = 0; i < numEntries; i++) {
       GptEntry *entry = GetEntry(&drive.gpt, ANY_VALID, i);
@@ -218,7 +218,7 @@ int CgptShow(CgptShowParams *params) {
 
   if (params->partition) {                      // show single partition
 
-    if (params->partition > GetNumberOfEntries(&drive.gpt)) {
+    if (params->partition > GetNumberOfEntries(&drive)) {
       Error("invalid partition number: %d\n", params->partition);
       return CGPT_FAILED;
     }
@@ -249,13 +249,13 @@ int CgptShow(CgptShowParams *params) {
         printf("%s\n", buf);
         break;
       case 'S':
-        printf("%d\n", GetSuccessful(&drive.gpt, ANY_VALID, index));
+        printf("%d\n", GetSuccessful(&drive, ANY_VALID, index));
         break;
       case 'T':
-        printf("%d\n", GetTries(&drive.gpt, ANY_VALID, index));
+        printf("%d\n", GetTries(&drive, ANY_VALID, index));
         break;
       case 'P':
-        printf("%d\n", GetPriority(&drive.gpt, ANY_VALID, index));
+        printf("%d\n", GetPriority(&drive, ANY_VALID, index));
         break;
       case 'A':
         printf("0x%x\n", entry->attrs.fields.gpt_att);
@@ -271,7 +271,7 @@ int CgptShow(CgptShowParams *params) {
     GptEntry *entry;
     char type[GUID_STRLEN];
 
-    for (i = 0; i < GetNumberOfEntries(&drive.gpt); ++i) {
+    for (i = 0; i < GetNumberOfEntries(&drive); ++i) {
       entry = GetEntry(&drive.gpt, ANY_VALID, i);
 
       if (GuidIsZero(&entry->type))
@@ -324,7 +324,7 @@ int CgptShow(CgptShowParams *params) {
 
     if (params->debug ||
         (drive.gpt.valid_entries & MASK_PRIMARY))
-      EntriesDetails(&drive.gpt, PRIMARY, params->numeric);
+      EntriesDetails(&drive, PRIMARY, params->numeric);
 
     /****************************** Secondary *************************/
     printf(GPT_FMT, (int)(drive.gpt.drive_sectors - GPT_HEADER_SECTOR -
@@ -342,7 +342,7 @@ int CgptShow(CgptShowParams *params) {
          (!(drive.gpt.valid_entries & MASK_PRIMARY) ||
           memcmp(drive.gpt.primary_entries, drive.gpt.secondary_entries,
                  TOTAL_ENTRIES_SIZE)))) {
-      EntriesDetails(&drive.gpt, SECONDARY, params->numeric);
+      EntriesDetails(&drive, SECONDARY, params->numeric);
     }
 
     if (drive.gpt.valid_headers & MASK_SECONDARY)