[LTP] [PATCH 2/2] hugemmap: use SAFE_STRTOL instead

[Wanlong Gao]

Use SAFE_STRTOL instead.

Signed-off-by: Wanlong Gao <gaowanl...@cn.fujitsu.com>
---
 testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c |    9 +++------
 testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c |    9 +++------
 testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c |    9 +++------
 testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c |    9 +++------
 4 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c 
b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
index c961099..c585303 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c
@@ -63,6 +63,7 @@
 #include "usctest.h"
 #include "system_specific_hugepages_info.h"
 #include "../../include/mem.h"
+#include "safe_macros.h"
 
 static char TEMPFILE[MAXPATHLEN];
 
@@ -103,12 +104,8 @@ int main(int ac, char **av)
                tst_tmpdir();
                Hopt = get_tst_tmpdir();
        }
-       if (sflag) {
-               hugepages = strtol(nr_opt, NULL, 10);
-               if (((hugepages == LONG_MAX || hugepages == LONG_MIN) &&
-                    errno == ERANGE) || (errno != 0 && hugepages == 0))
-                       tst_brkm(TBROK|TERRNO, NULL, "strtol");
-       }
+       if (sflag)
+               hugepages = SAFE_STRTOL(NULL, nr_opt, LONG_MIN, LONG_MAX);
 
        setup();
 
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c 
b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
index 03689c3..c9529ea 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
@@ -56,6 +56,7 @@
 #include "usctest.h"
 #include "system_specific_hugepages_info.h"
 #include "../../include/mem.h"
+#include "safe_macros.h"
 
 #define LOW_ADDR       (void *)(0x80000000)
 #define LOW_ADDR2      (void *)(0x90000000)
@@ -100,12 +101,8 @@ int main(int ac, char **av)
                tst_tmpdir();
                Hopt = get_tst_tmpdir();
        }
-       if (sflag) {
-               hugepages = strtol(nr_opt, NULL, 10);
-               if (((hugepages == LONG_MAX || hugepages == LONG_MIN) &&
-                    errno == ERANGE) || (errno != 0 && hugepages == 0))
-                       tst_brkm(TBROK|TERRNO, NULL, "strtol");
-       }
+       if (sflag)
+               hugepages = SAFE_STRTOL(NULL, nr_opt, LONG_MIN, LONG_MAX);
 
        page_sz = getpagesize();
        map_sz = 2 * 1024 * hugepages_size();
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c 
b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c
index 1bdef3a..7e62098 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap03.c
@@ -47,6 +47,7 @@
 #include "usctest.h"
 #include "system_specific_hugepages_info.h"
 #include "../../include/mem.h"
+#include "safe_macros.h"
 
 #define HIGH_ADDR      (void *)(0x1000000000000)
 
@@ -90,12 +91,8 @@ int main(int ac, char **av)
                tst_tmpdir();
                Hopt = get_tst_tmpdir();
        }
-       if (sflag) {
-               hugepages = strtol(nr_opt, NULL, 10);
-               if (((hugepages == LONG_MAX || hugepages == LONG_MIN) &&
-                    errno == ERANGE) || (errno != 0 && hugepages == 0))
-                       tst_brkm(TBROK|TERRNO, NULL, "strtol");
-       }
+       if (sflag)
+               hugepages = SAFE_STRTOL(NULL, nr_opt, LONG_MIN, LONG_MAX);
 
        page_sz = getpagesize();
 
diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c 
b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
index ddec060..46e27b2 100644
--- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
+++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c
@@ -64,6 +64,7 @@
 #include "usctest.h"
 #include "system_specific_hugepages_info.h"
 #include "../../include/mem.h"
+#include "safe_macros.h"
 
 static char TEMPFILE[MAXPATHLEN];
 
@@ -106,12 +107,8 @@ int main(int ac, char **av)
                tst_tmpdir();
                Hopt = get_tst_tmpdir();
        }
-       if (sflag) {
-               hugepages = strtol(nr_opt, NULL, 10);
-               if (((hugepages == LONG_MAX || hugepages == LONG_MIN) &&
-                    errno == ERANGE) || (errno != 0 && hugepages == 0))
-                       tst_brkm(TBROK|TERRNO, NULL, "strtol");
-       }
+       if (sflag)
+               hugepages = SAFE_STRTOL(NULL, nr_opt, LONG_MIN, LONG_MAX);
 
        /* Check number of hugepages */
        if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
-- 
1.7.9


------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list