lib-fs-resize: remove unused probe-related code

* libparted/fs/r/hfs/probe.c: Remove probe-related functions.
There are not used.
* libparted/fs/r/fat/fat.c: Likewise.
* libparted/fs/r/hfs/probe.h: ...and declarations.

diff --git a/libparted/fs/r/fat/fat.c b/libparted/fs/r/fat/fat.c
index 0cecc5e..9d43e21 100644 (file)
--- a/libparted/fs/r/fat/fat.c
+++ b/libparted/fs/r/fat/fat.c
@@ -108,64 +108,6 @@ fat_set_frag_sectors (PedFileSystem* fs, PedSector frag_sectors)
        return 1;
 }
 
-PedGeometry*
-fat_probe (PedGeometry* geom, FatType* fat_type)
-{
-       PedFileSystem*          fs;
-       FatSpecific*            fs_info;
-       PedGeometry*            result;
-
-       fs = fat_alloc (geom);
-       if (!fs)
-               goto error;
-       fs_info = (FatSpecific*) fs->type_specific;
-
-       if (!fat_boot_sector_read (&fs_info->boot_sector, geom))
-               goto error_free_fs;
-       if (!fat_boot_sector_analyse (&fs_info->boot_sector, fs))
-               goto error_free_fs;
-
-       *fat_type = fs_info->fat_type;
-       result = ped_geometry_new (geom->dev, geom->start,
-                                  fs_info->sector_count);
-
-       fat_free (fs);
-       return result;
-
-error_free_fs:
-       fat_free (fs);
-error:
-       return NULL;
-}
-
-PedGeometry*
-fat_probe_fat16 (PedGeometry* geom)
-{
-       FatType         fat_type;
-       PedGeometry*    probed_geom = fat_probe (geom, &fat_type);
-
-       if (probed_geom) {
-               if (fat_type == FAT_TYPE_FAT16)
-                       return probed_geom;
-               ped_geometry_destroy (probed_geom);
-       }
-       return NULL;
-}
-
-PedGeometry*
-fat_probe_fat32 (PedGeometry* geom)
-{
-       FatType         fat_type;
-       PedGeometry*    probed_geom = fat_probe (geom, &fat_type);
-
-       if (probed_geom) {
-               if (fat_type == FAT_TYPE_FAT32)
-                       return probed_geom;
-               ped_geometry_destroy (probed_geom);
-       }
-       return NULL;
-}
-
 #ifndef DISCOVER_ONLY
 int
 fat_clobber (PedGeometry* geom)

diff --git a/libparted/fs/r/hfs/probe.c b/libparted/fs/r/hfs/probe.c
index cc422b9..376a821 100644 (file)
--- a/libparted/fs/r/hfs/probe.c
+++ b/libparted/fs/r/hfs/probe.c
@@ -96,135 +96,3 @@ hfs_and_wrapper_probe (PedGeometry* geom)
        ped_geometry_destroy (geom_ret);
        return NULL;
 }
-
-PedGeometry*
-hfsplus_probe (PedGeometry* geom)
-{
-       PedGeometry*    geom_ret;
-       uint8_t         buf[PED_SECTOR_SIZE_DEFAULT];
-
-       PED_ASSERT (geom != NULL);
-
-       if (!hfsc_can_use_geom (geom))
-               return NULL;
-
-       if ((geom_ret = hfs_and_wrapper_probe(geom))) {
-               /* HFS+ is embedded in an HFS volume ? */
-               HfsMasterDirectoryBlock *mdb;
-               mdb = (HfsMasterDirectoryBlock *) buf;
-
-               if (!ped_geometry_read (geom, buf, 2, 1)
-                   || (mdb->old_new.embedded.signature
-                       != PED_CPU_TO_BE16 (HFSP_SIGNATURE))) {
-                       ped_geometry_destroy (geom_ret);
-                       return NULL;
-               } else
-                       return geom_ret;
-       } else {
-               /* This is a standalone HFS+ volume ? */
-               PedSector       search, max;
-               HfsPVolumeHeader *vh;
-               vh = (HfsPVolumeHeader *) buf;
-
-               if ((geom->length < 5)
-                   || !ped_geometry_read (geom, buf, 2, 1)
-                   || (vh->signature != PED_CPU_TO_BE16 (HFSP_SIGNATURE)))
-                       return NULL;
-
-               /* Correct range is indeed [ blocks*sz-2;(blocs+1)*sz-2 ( */
-               /* But previous versions of my implementation used to */
-               /* assume range is [(blocks-1)*sz-1;(blocks*sz) ( */
-               /* (blocks-1)*sz-1 has to be scanned last, because */
-               /* it can belong to a regular file */
-               max = ((PedSector) PED_BE32_TO_CPU (vh->total_blocks) + 1)
-                     * ( PED_BE32_TO_CPU (vh->block_size) / PED_SECTOR_SIZE_DEFAULT )
-                     - 2;
-               search = max - 2 * ( PED_BE32_TO_CPU (vh->block_size)
-                                    / PED_SECTOR_SIZE_DEFAULT ) + 2;
-               if (!(geom_ret = ped_geometry_new (geom->dev, geom->start,
-                                                  search + 2)))
-                       return NULL;
-
-               for (; search < max; search++) {
-                       if (!ped_geometry_set (geom_ret, geom_ret->start,
-                                              search + 2)
-                           || !ped_geometry_read (geom_ret, buf, search, 1))
-                               break;
-                       if (vh->signature == PED_CPU_TO_BE16 (HFSP_SIGNATURE))
-                               return geom_ret;
-               }
-               search = ((PedSector) PED_BE32_TO_CPU (vh->total_blocks) - 1)
-                     * ( PED_BE32_TO_CPU (vh->block_size) / PED_SECTOR_SIZE_DEFAULT )
-                     - 1;
-               if (!ped_geometry_set (geom_ret, geom_ret->start,
-                                              search + 2)
-                   || !ped_geometry_read (geom_ret, buf, search, 1)
-                   || vh->signature != PED_CPU_TO_BE16 (HFSP_SIGNATURE)) {
-                       ped_geometry_destroy (geom_ret);
-                       return NULL;
-               } else
-                       return geom_ret;
-       }
-}
-
-PedGeometry*
-hfs_probe (PedGeometry* geom)
-{
-       PedGeometry*    geom_base;
-       PedGeometry*    geom_plus = NULL;
-
-       PED_ASSERT (geom != NULL);
-
-       if (!hfsc_can_use_geom (geom))
-               return NULL;
-
-       if ((geom_base = hfs_and_wrapper_probe(geom))
-           && (!(geom_plus = hfsplus_probe(geom_base))))
-               return geom_base;
-       else {
-               if (geom_base) ped_geometry_destroy (geom_base);
-               if (geom_plus) ped_geometry_destroy (geom_plus);
-               return NULL;
-       }
-}
-
-PedGeometry*
-hfsx_probe (PedGeometry* geom)
-{
-       PedGeometry*    geom_ret;
-       uint8_t         buf[PED_SECTOR_SIZE_DEFAULT];
-       PedSector       search, max;
-       HfsPVolumeHeader *vh = (HfsPVolumeHeader *) buf;
-
-       PED_ASSERT (geom != NULL);
-
-       if (!hfsc_can_use_geom (geom))
-               return NULL;
-
-       if ((geom->length < 5)
-           || !ped_geometry_read (geom, buf, 2, 1)
-           || (vh->signature != PED_CPU_TO_BE16 (HFSX_SIGNATURE)))
-               return NULL;
-
-       /* unlike the hfs+ code, which should be kept compatible
-       with my old previous implementations, we only care here
-       about legal alternate VH positions, like TN1150 describes them */
-       max = ((PedSector) PED_BE32_TO_CPU (vh->total_blocks) + 1)
-                     * ( PED_BE32_TO_CPU (vh->block_size) / PED_SECTOR_SIZE_DEFAULT )
-                     - 2;
-       search = max - ( PED_BE32_TO_CPU (vh->block_size) / PED_SECTOR_SIZE_DEFAULT );
-       if (!(geom_ret = ped_geometry_new (geom->dev, geom->start,
-                                          search + 2)))
-               return NULL;
-       for (; search < max; search++) {
-               if (!ped_geometry_set (geom_ret, geom_ret->start,
-                                      search + 2)
-                   || !ped_geometry_read (geom_ret, buf, search, 1))
-                       break;
-               if (vh->signature == PED_CPU_TO_BE16 (HFSX_SIGNATURE))
-                       return geom_ret;
-       }
-
-       ped_geometry_destroy (geom_ret);
-       return NULL;
-}

diff --git a/libparted/fs/r/hfs/probe.h b/libparted/fs/r/hfs/probe.h
index 0b4a01f..ba754bb 100644 (file)
--- a/libparted/fs/r/hfs/probe.h
+++ b/libparted/fs/r/hfs/probe.h
@@ -31,13 +31,4 @@ hfsc_can_use_geom (PedGeometry* geom);
 PedGeometry*
 hfs_and_wrapper_probe (PedGeometry* geom);
 
-PedGeometry*
-hfsplus_probe (PedGeometry* geom);
-
-PedGeometry*
-hfs_probe (PedGeometry* geom);
-
-PedGeometry*
-hfsx_probe (PedGeometry* geom);
-
 #endif /* _PROBE_H */