gpt: clean up

* libparted/labels/gpt.c (gpt_probe): Remove now-useless test before
pth_free.
(gpt_read): Use ptt_clear_sectors in place of open-coded equivalent.
* cfg.mk (useless_free_options): Add --name=pth_free.

diff --git a/cfg.mk b/cfg.mk
index 3b35dc2..1ce37f7 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -46,3 +46,6 @@ old_NEWS_hash = 5d0c8961833d95e7fb0d467596a8613f
 include $(srcdir)/dist-check.mk
 
 update-copyright-env = UPDATE_COPYRIGHT_USE_INTERVALS=1
+
+useless_free_options = \
+  --name=pth_free

diff --git a/libparted/labels/gpt.c b/libparted/labels/gpt.c
index cbaffa9..b17ae53 100644 (file)
--- a/libparted/labels/gpt.c
+++ b/libparted/labels/gpt.c
@@ -447,8 +447,7 @@ gpt_probe (const PedDevice *dev)
 
   free (pth_raw);
 
-  if (gpt)
-    pth_free (gpt); // FIXME: now that pth_free works on NULL, remove the "if"
+  pth_free (gpt);
 
   if (!gpt_sig_found)
     return 0;
@@ -909,16 +908,8 @@ gpt_read (PedDisk *disk)
             case PED_EXCEPTION_CANCEL:
               goto error_free_gpt;
             case PED_EXCEPTION_FIX:
-              {
-                char *zeros = ped_malloc (pth_get_size (disk->dev));
-                memset (zeros, 0, disk->dev->sector_size);
-                ped_device_write (disk->dev, zeros,
-                                  PED_LE64_TO_CPU (primary_gpt->AlternateLBA), 1);
-                free (zeros);
-                /* FIXME: Replace the above with this:
-                   ptt_clear_sectors (disk-.dev,
-                       PED_LE64_TO_CPU (primary_gpt->AlternateLBA), 1); */
-              }
+              ptt_clear_sectors (disk->dev,
+                                 PED_LE64_TO_CPU (primary_gpt->AlternateLBA), 1);
               break;
             default:
               write_back = 0;