fdisk: add fdisk_dev_sectsz_is_default helper

Instead of printing this warning from the API, add a helper and call it from
fdisk logic.

Signed-off-by: Davidlohr Bueso <dave@gnu.org>

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index 190b21061b13aaa9f4f66942e0a503cff0d943a4..578b72d9a820c25133e30eff9662c44cad4ee4d6 100644 (file)
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2154,6 +2154,10 @@ int main(int argc, char **argv)
 
        print_welcome();
 
+       if (!fdisk_dev_sectsz_is_default(cxt))
+               printf(_("Note: sector size is %ld (not %d)\n"),
+                      cxt->sector_size, DEFAULT_SECTOR_SIZE);
+
        gpt_warning(cxt->dev_path);
        get_boot(cxt, 0);
 

diff --git a/fdisk/fdisk.h b/fdisk/fdisk.h
index 61853d14cd02c29fba2d6eec7a02ef11f27ebbbf..f73d13afc452c39032d95bc18e304805abf23b07 100644 (file)
--- a/fdisk/fdisk.h
+++ b/fdisk/fdisk.h
@@ -119,6 +119,7 @@ struct fdisk_context {
 
 extern struct fdisk_context *fdisk_new_context_from_filename(const char *fname, int readonly);
 extern int fdisk_dev_has_topology(struct fdisk_context *cxt);
+extern int fdisk_dev_sectsz_is_default(struct fdisk_context *cxt);
 extern void fdisk_free_context(struct fdisk_context *cxt);
 
 /* prototypes for fdisk.c */

diff --git a/fdisk/utils.c b/fdisk/utils.c
index 3162c7054dbf74ac559c0586d3251a5747dbc5cd..94b8bd84efa6974d76d17c069db44dcf60b5abaf 100644 (file)
--- a/fdisk/utils.c
+++ b/fdisk/utils.c
@@ -80,13 +80,21 @@ static int __discover_topology(struct fdisk_context *cxt)
        cxt->sector_size = __get_sector_size(cxt->dev_fd);
        if (!cxt->phy_sector_size) /* could not discover physical size */
                cxt->phy_sector_size = cxt->sector_size;
-       if (cxt->sector_size != DEFAULT_SECTOR_SIZE)
-               printf(_("Note: sector size is %ld (not %d)\n"),
-                      cxt->sector_size, DEFAULT_SECTOR_SIZE);
 
        return 0;
 }
 
+/**
+ * fdisk_dev_sectsz_is_default:
+ * @cxt: fdisk context
+ *
+ * Returns 1 if the device's sector size is the default value, otherwise 0.
+ */
+int fdisk_dev_sectsz_is_default(struct fdisk_context *cxt)
+{
+       return cxt->sector_size == DEFAULT_SECTOR_SIZE;
+}
+
 /**
  * fdisk_dev_has_topology:
  * @cxt: fdisk context