tree-wide: use UINT64_MAX or friends

[thirdparty/systemd.git] / src / test / test-hexdecoct.c

diff --git a/src/test/test-hexdecoct.c b/src/test/test-hexdecoct.c
index fb98826c2785ba85adad98f2c00d719d4fb477f0..c9d318b8d16183e3261a6506f8154b060b07c69b 100644 (file)
--- a/src/test/test-hexdecoct.c
+++ b/src/test/test-hexdecoct.c
@@ -1,9 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-***/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <errno.h>
 
@@ -85,11 +80,11 @@ static void test_unhexmem_one(const char *s, size_t l, int retval) {
         if (retval == 0) {
                 char *answer;
 
-                if (l == (size_t) - 1)
+                if (l == SIZE_MAX)
                         l = strlen(s);
 
-                assert_se((hex = hexmem(mem, len)));
-                answer = strndupa(s, l);
+                assert_se(hex = hexmem(mem, len));
+                answer = strndupa(strempty(s), l);
                 assert_se(streq(delete_chars(answer, WHITESPACE), hex));
         }
 }
@@ -101,15 +96,15 @@ static void test_unhexmem(void) {
 
         test_unhexmem_one(NULL, 0, 0);
         test_unhexmem_one("", 0, 0);
-        test_unhexmem_one("", (size_t) -1, 0);
-        test_unhexmem_one("   \n \t\r   \t\t \n\n\n", (size_t) -1, 0);
+        test_unhexmem_one("", SIZE_MAX, 0);
+        test_unhexmem_one("   \n \t\r   \t\t \n\n\n", SIZE_MAX, 0);
         test_unhexmem_one(hex_invalid, strlen(hex_invalid), -EINVAL);
         test_unhexmem_one(hex_invalid, (size_t) - 1, -EINVAL);
         test_unhexmem_one(hex, strlen(hex) - 1, -EPIPE);
         test_unhexmem_one(hex, strlen(hex), 0);
-        test_unhexmem_one(hex, (size_t) -1, 0);
+        test_unhexmem_one(hex, SIZE_MAX, 0);
         test_unhexmem_one(hex_space, strlen(hex_space), 0);
-        test_unhexmem_one(hex_space, (size_t) -1, 0);
+        test_unhexmem_one(hex_space, SIZE_MAX, 0);
 }
 
 /* https://tools.ietf.org/html/rfc4648#section-10 */
@@ -191,7 +186,7 @@ static void test_unbase32hexmem_one(const char *hex, bool padding, int retval, c
         _cleanup_free_ void *mem = NULL;
         size_t len;
 
-        assert_se(unbase32hexmem(hex, (size_t) -1, padding, &mem, &len) == retval);
+        assert_se(unbase32hexmem(hex, SIZE_MAX, padding, &mem, &len) == retval);
         if (retval == 0) {
                 char *str;
 
@@ -238,7 +233,6 @@ static void test_unbase32hexmem(void) {
         test_unbase32hexmem_one("CPNMUOG=", false, -EINVAL, NULL);
         test_unbase32hexmem_one("CPNMUOJ1E8======", false, -EINVAL, NULL);
 
-        test_unbase32hexmem_one("A", false, -EINVAL, NULL);
         test_unbase32hexmem_one("A", false, -EINVAL, NULL);
         test_unbase32hexmem_one("AAA", false, -EINVAL, NULL);
         test_unbase32hexmem_one("AAAAAA", false, -EINVAL, NULL);
@@ -285,7 +279,7 @@ static void test_unbase64mem_one(const char *input, const char *output, int ret)
         _cleanup_free_ void *buffer = NULL;
         size_t size = 0;
 
-        assert_se(unbase64mem(input, (size_t) -1, &buffer, &size) == ret);
+        assert_se(unbase64mem(input, SIZE_MAX, &buffer, &size) == ret);
 
         if (ret >= 0) {
                 assert_se(size == strlen(output));