mkfs: use cvtnum from libfrog

[thirdparty/xfsprogs-dev.git] / libfrog / convert.c

diff --git a/libfrog/convert.c b/libfrog/convert.c
index 8d4d4077b3313b6c8061fb62f213bf0818c0f353..6b8ff30de24a34b58213a6eb7fd9ee52b56d5164 100644 (file)
--- a/libfrog/convert.c
+++ b/libfrog/convert.c
@@ -182,9 +182,9 @@ cvt_u16(
 
 long long
 cvtnum(
-       size_t          blocksize,
-       size_t          sectorsize,
-       char            *s)
+       size_t          blksize,
+       size_t          sectsize,
+       const char      *s)
 {
        long long       i;
        char            *sp;
@@ -202,9 +202,13 @@ cvtnum(
        c = tolower(*sp);
        switch (c) {
        case 'b':
-               return i * blocksize;
+               if (!blksize)
+                       return -1LL;
+               return i * blksize;
        case 's':
-               return i * sectorsize;
+               if (!sectsize)
+                       return -1LL;
+               return i * sectsize;
        case 'k':
                return KILOBYTES(i);
        case 'm':