fdisk: cleanup strtoxx_or_err()

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c
index bb7d8f5b907828cdb9b47e975b8e0d93252b2135..967a1034c658fd8f233b64c33fb64a28f6a44f0c 100644 (file)
--- a/fdisk/cfdisk.c
+++ b/fdisk/cfdisk.c
@@ -2776,7 +2776,7 @@ main(int argc, char **argv)
            arrow_cursor = TRUE;
            break;
        case 'c':
-               user_cylinders = cylinders = strtoll_or_err(optarg, _("cannot parse number of cylinders"));
+               user_cylinders = cylinders = strtos64_or_err(optarg, _("cannot parse number of cylinders"));
            if (cylinders <= 0) {
                fprintf(stderr, "%s: %s\n", argv[0], _("Illegal cylinders value"));
                exit(1);

diff --git a/fdisk/fdisk.c b/fdisk/fdisk.c
index d8a9558cc4bf6b31e88bc881888eb641dc801fca..3f832977c1ec124327c9460daad00087c8f66778 100644 (file)
--- a/fdisk/fdisk.c
+++ b/fdisk/fdisk.c
@@ -2109,7 +2109,7 @@ main(int argc, char **argv) {
                           so cannot be combined with multiple disks,
                           and te same goes for the C/H/S options.
                        */
-                       sector_size = strtol_or_err(optarg, _("cannot parse sector size"));
+                       sector_size = strtou32_or_err(optarg, _("invalid sector size argument"));
                        if (sector_size != 512 && sector_size != 1024 &&
                            sector_size != 2048 && sector_size != 4096)
                                usage(stderr);
@@ -2117,7 +2117,7 @@ main(int argc, char **argv) {
                        user_set_sector_size = 1;
                        break;
                case 'C':
-                       user_cylinders =  strtol_or_err(optarg, _("cannot parse number of cylinders"));
+                       user_cylinders =  strtou32_or_err(optarg, _("invalid cylinders argument"));
                        break;
                case 'c':
                        dos_compatible_flag = 0;        /* default */
@@ -2131,13 +2131,13 @@ main(int argc, char **argv) {
                        usage(stdout);
                        break;
                case 'H':
-                       user_heads =  strtol_or_err(optarg, _("cannot parse number of heads"));
-                       if (user_heads <= 0 || user_heads > 256)
+                       user_heads = strtou32_or_err(optarg, _("invalid heads argument"));
+                       if (user_heads > 256)
                                user_heads = 0;
                        break;
                case 'S':
-                       user_sectors =  strtol_or_err(optarg, _("cannot parse number of sectors"));
-                       if (user_sectors <= 0 || user_sectors >= 64)
+                       user_sectors =  strtou32_or_err(optarg, _("invalid sectors argument"));
+                       if (user_sectors >= 64)
                                user_sectors = 0;
                        break;
                case 'l':

diff --git a/fdisk/sfdisk.c b/fdisk/sfdisk.c
index cda6a77d8f82ce07f7be9d67877dd8d44745714d..c9853867a3b9fd493071251393ee11ecfde8e7c8 100644 (file)
--- a/fdisk/sfdisk.c
+++ b/fdisk/sfdisk.c
@@ -2644,7 +2644,7 @@ main(int argc, char **argv) {
            activate = 1;
            break;
        case 'C':
-           U.cylinders = strtoll_or_err(optarg, _("cannot parse number of cylinders"));
+           U.cylinders = strtoul_or_err(optarg, _("invalid cylinders argument"));
            break;
        case 'D':
            DOS = 1;
@@ -2653,13 +2653,13 @@ main(int argc, char **argv) {
            DOS_extended = 1;
            break;
        case 'H':
-           U.heads = strtol_or_err(optarg, _("cannot parse number of heads"));
+           U.heads = strtoul_or_err(optarg, _("invalid heads argument"));
            break;
        case 'L':
            Linux = 1;
            break;
        case 'N':
-           one_only = strtol_or_err(optarg, _("cannot parse number of partitions"));
+           one_only = strtol_or_err(optarg, _("invalid number of partitions argument"));
            break;
        case 'I':
            restore_sector_file = optarg;
@@ -2671,7 +2671,7 @@ main(int argc, char **argv) {
            opt_reread = 1;
            break;
        case 'S':
-           U.sectors = strtol_or_err(optarg, _("cannot parse number of sectors"));
+           U.sectors = strtoul_or_err(optarg, _("invalid sectors argument"));
            break;
        case 'T':
            list_types();