_scratch_mkfs_geom(): Filter out 'k' suffix from fs block size

[xfstests-dev.git] / dmapi / src / sample_hsm / migfind.c

diff --git a/dmapi/src/sample_hsm/migfind.c b/dmapi/src/sample_hsm/migfind.c
index afd24f8eab94e010be66f9f3b8d11e91e7a2045b..95b6d6d5dc7dbe1fb914f7edefebd9e9bb1cd4ca 100644 (file)
--- a/dmapi/src/sample_hsm/migfind.c
+++ b/dmapi/src/sample_hsm/migfind.c
@@ -30,9 +30,11 @@
 
 #include <lib/hsm.h>
 
+#include <getopt.h>
+
 #define NUMLEN 16              /* arbitrary max len of input size */
-#define MAX_K   (((u_int)LONG_MAX + 1) / 1024)
-#define MAX_M   (((u_int)LONG_MAX + 1) / (1024*1024))
+#define MAX_K   (((u_int)LONG_MAX) / 1024)
+#define MAX_M   (((u_int)LONG_MAX) / (1024*1024))
 
 
 
@@ -76,7 +78,7 @@ verify_size(
 
         size = strtol(str,0,0); 
         if (size < 0 || size >= LONG_MAX ) {
-                printf("Size %d is invalid \n", size);
+                printf("Size %lld is invalid \n", (long long) size);
                 return(1);
         }
 
@@ -85,21 +87,13 @@ verify_size(
                 cp++;
         if (*cp == 'k' || *cp == 'K') {
                 if ( size >= (u_int) MAX_K) {
-#ifdef __sgi
-                        printf("Size %lld is invalid\n", size);
-#else
-                        printf("Size %ld is invalid\n", size);
-#endif
+                        printf("Size %lld is invalid\n", (long long) size);
                         return(1);
                 }
                 size *= 1024;
         } else if (*cp == 'm' || *cp == 'M') {
                 if ( size >= (u_int) MAX_M) {
-#ifdef __sgi
-                        printf("Size %lld is invalid\n", size);
-#else
-                        printf("Size %ld is invalid\n", size);
-#endif
+                        printf("Size %lld is invalid\n", (long long) size);
                         return(1);
                 }
                 size *= (1024*1024);