On 02/10/2012 11:16 AM, Wanlong Gao wrote:
> Use SAFE_STRTOL instead.
>
> Signed-off-by: Wanlong Gao <[email protected]>
Hi, Committed.
Thanks,
Caspar
> ---
> 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..d3cb9ec 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, 0, LONG_MAX);
>
> setup();
>
> diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
> b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c
> index 03689c3..062883b 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, 0, 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..f81d7ac 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, 0, 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..c28d5de 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, 0, LONG_MAX);
>
> /* Check number of hugepages */
> if (get_no_of_hugepages() <= 0 || hugepages_size() <= 0)
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
