From bc264ab6f58177124d49a72b4a808eb97fa2cb25 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 2 Jul 2021 13:51:45 -0400
Subject: Avoid use of atoi() and atol()

---
 benchmark/.clang-tidy    | 1 -
 benchmark/tree_bench.c   | 4 ++--
 test/.clang-tidy         | 1 -
 test/btree_test.c        | 6 +++---
 test/ring_test.c         | 4 ++--
 test/sem_test.c          | 2 +-
 test/sorted_array_test.c | 4 ++--
 test/tree_test.c         | 4 ++--
 8 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/benchmark/.clang-tidy b/benchmark/.clang-tidy
index eab2452..06febc0 100644
--- a/benchmark/.clang-tidy
+++ b/benchmark/.clang-tidy
@@ -7,7 +7,6 @@ Checks: >
   -bugprone-suspicious-string-compare,
   -cert-dcl37-c,
   -cert-dcl51-cpp,
-  -cert-err34-c,
   -cert-msc30-c,
   -cert-msc32-c,
   -cert-msc50-cpp,
diff --git a/benchmark/tree_bench.c b/benchmark/tree_bench.c
index 4ac1419..bd274b1 100644
--- a/benchmark/tree_bench.c
+++ b/benchmark/tree_bench.c
@@ -393,8 +393,8 @@ main(int argc, char** argv)
     return 1;
   }
 
-  const size_t min_n = atol(argv[1]);
-  const size_t max_n = atol(argv[2]);
+  const size_t min_n = strtoul(argv[1], NULL, 10);
+  const size_t max_n = strtoul(argv[2], NULL, 10);
 
   fprintf(stderr, "Benchmarking %zu .. %zu elements\n", min_n, max_n);
 
diff --git a/test/.clang-tidy b/test/.clang-tidy
index ecef880..9424c6a 100644
--- a/test/.clang-tidy
+++ b/test/.clang-tidy
@@ -8,7 +8,6 @@ Checks: >
   -bugprone-suspicious-string-compare,
   -cert-dcl37-c,
   -cert-dcl51-cpp,
-  -cert-err34-c,
   -cert-msc30-c,
   -cert-msc50-cpp,
   -clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,
diff --git a/test/btree_test.c b/test/btree_test.c
index d4dd6b4..ccb0cbc 100644
--- a/test/btree_test.c
+++ b/test/btree_test.c
@@ -527,10 +527,10 @@ main(int argc, char** argv)
     return EXIT_FAILURE;
   }
 
-  const unsigned n_tests = 3;
-  unsigned       n_elems = (argc > 1) ? (unsigned)atol(argv[1]) : 524288u;
+  const unsigned n_tests = 3u;
+  const size_t   n_elems = (argc > 1) ? strtoul(argv[1], NULL, 10) : 524288u;
 
-  printf("Running %u tests with %u elements", n_tests, n_elems);
+  printf("Running %u tests with %lu elements", n_tests, n_elems);
   for (unsigned i = 0; i < n_tests; ++i) {
     printf(".");
     fflush(stdout);
diff --git a/test/ring_test.c b/test/ring_test.c
index 24163fe..7616346 100644
--- a/test/ring_test.c
+++ b/test/ring_test.c
@@ -121,12 +121,12 @@ main(int argc, char** argv)
 
   unsigned size = 1024;
   if (argc > 1) {
-    size = (unsigned)atoi(argv[1]);
+    size = (unsigned)strtoul(argv[1], NULL, 10);
   }
 
   n_writes = size * 1024;
   if (argc > 2) {
-    n_writes = (unsigned)atoi(argv[2]);
+    n_writes = (unsigned)strtoul(argv[2], NULL, 10);
   }
 
   zix_ring_free(NULL);
diff --git a/test/sem_test.c b/test/sem_test.c
index 0b4faba..9a25e66 100644
--- a/test/sem_test.c
+++ b/test/sem_test.c
@@ -58,7 +58,7 @@ main(int argc, char** argv)
   }
 
   if (argc > 1) {
-    n_signals = (unsigned)atoi(argv[1]);
+    n_signals = (unsigned)strtol(argv[1], NULL, 10);
   }
 
   printf("Testing %u signals...\n", n_signals);
diff --git a/test/sorted_array_test.c b/test/sorted_array_test.c
index b39fa8d..9256118 100644
--- a/test/sorted_array_test.c
+++ b/test/sorted_array_test.c
@@ -192,9 +192,9 @@ main(int argc, char** argv)
   if (argc == 1) {
     n_elems = 4096;
   } else {
-    n_elems = (unsigned)atol(argv[1]);
+    n_elems = (unsigned)strtoul(argv[1], NULL, 10);
     if (argc > 2) {
-      seed = (unsigned)atol(argv[2]);
+      seed = (unsigned)strtoul(argv[2], NULL, 10);
     } else {
       seed = (unsigned)time(NULL);
     }
diff --git a/test/tree_test.c b/test/tree_test.c
index 208080d..eb0eddc 100644
--- a/test/tree_test.c
+++ b/test/tree_test.c
@@ -216,9 +216,9 @@ main(int argc, char** argv)
   if (argc == 1) {
     n_elems = 100000;
   } else {
-    n_elems = (unsigned)atol(argv[1]);
+    n_elems = (unsigned)strtoul(argv[1], NULL, 10);
     if (argc > 2) {
-      seed = (unsigned)atol(argv[2]);
+      seed = (unsigned)strtoul(argv[2], NULL, 10);
     } else {
       seed = (unsigned)time(NULL);
     }
-- 
cgit v1.2.1