From: Alejandro Colomar <alx@kernel.org>
Date: Sat, 6 Jan 2024 01:25:21 +0000 (+0100)
Subject: lib/, tests/: addsl2(): Rename addsl() to addsl2()
X-Git-Tag: 4.15.0-rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e5fc4c90b6c04ed4aca43e906122ff2d85dc081;p=thirdparty%2Fshadow.git

lib/, tests/: addsl2(): Rename addsl() to addsl2()

This is for consistency with addsl3(), and in preparation for the
following commit, which will unify the interface into a single addsl()
macro.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/lib/adds.c b/lib/adds.c
index d442b7541..b5ea3bb66 100644
--- a/lib/adds.c
+++ b/lib/adds.c
@@ -7,7 +7,7 @@
 #include "adds.h"
 
 
-extern inline long addsl(long a, long b);
+extern inline long addsl2(long a, long b);
 extern inline long addsl3(long a, long b, long c);
 
 extern inline int cmpl(const void *p1, const void *p2);
diff --git a/lib/adds.h b/lib/adds.h
index dde5b5c72..107e64e24 100644
--- a/lib/adds.h
+++ b/lib/adds.h
@@ -15,14 +15,14 @@
 #include "sizeof.h"
 
 
-inline long addsl(long a, long b);
+inline long addsl2(long a, long b);
 inline long addsl3(long a, long b, long c);
 
 inline int cmpl(const void *p1, const void *p2);
 
 
 inline long
-addsl(long a, long b)
+addsl2(long a, long b)
 {
 	if (a > 0 && b > LONG_MAX - a) {
 		errno = EOVERFLOW;
diff --git a/tests/unit/test_adds.c b/tests/unit/test_adds.c
index 1435bd4e0..72790a593 100644
--- a/tests/unit/test_adds.c
+++ b/tests/unit/test_adds.c
@@ -13,24 +13,24 @@
 #include "adds.h"
 
 
-static void test_addsl_ok(void **state);
-static void test_addsl_underflow(void **state);
-static void test_addsl_overflow(void **state);
-static void test_addsl3_ok(void **state);
-static void test_addsl3_underflow(void **state);
-static void test_addsl3_overflow(void **state);
+static void test_addsl_2_ok(void **state);
+static void test_addsl_2_underflow(void **state);
+static void test_addsl_2_overflow(void **state);
+static void test_addsl_3_ok(void **state);
+static void test_addsl_3_underflow(void **state);
+static void test_addsl_3_overflow(void **state);
 
 
 int
 main(void)
 {
     const struct CMUnitTest  tests[] = {
-        cmocka_unit_test(test_addsl_ok),
-        cmocka_unit_test(test_addsl_underflow),
-        cmocka_unit_test(test_addsl_overflow),
-        cmocka_unit_test(test_addsl3_ok),
-        cmocka_unit_test(test_addsl3_underflow),
-        cmocka_unit_test(test_addsl3_overflow),
+        cmocka_unit_test(test_addsl_2_ok),
+        cmocka_unit_test(test_addsl_2_underflow),
+        cmocka_unit_test(test_addsl_2_overflow),
+        cmocka_unit_test(test_addsl_3_ok),
+        cmocka_unit_test(test_addsl_3_underflow),
+        cmocka_unit_test(test_addsl_3_overflow),
     };
 
     return cmocka_run_group_tests(tests, NULL, NULL);
@@ -38,39 +38,39 @@ main(void)
 
 
 static void
-test_addsl_ok(void **state)
+test_addsl_2_ok(void **state)
 {
-	assert_true(addsl(1, 3)			== 1 + 3);
-	assert_true(addsl(-4321, 7)		== -4321 + 7);
-	assert_true(addsl(1, 1)			== 1 + 1);
-	assert_true(addsl(-1, -2)		== -1 - 2);
-	assert_true(addsl(LONG_MAX, -1)		== LONG_MAX - 1);
-	assert_true(addsl(LONG_MIN, 1)		== LONG_MIN + 1);
-	assert_true(addsl(LONG_MIN, LONG_MAX)	== LONG_MIN + LONG_MAX);
-	assert_true(addsl(0, 0)			== 0);
+	assert_true(addsl2(1, 3)		== 1 + 3);
+	assert_true(addsl2(-4321, 7)		== -4321 + 7);
+	assert_true(addsl2(1, 1)		== 1 + 1);
+	assert_true(addsl2(-1, -2)		== -1 - 2);
+	assert_true(addsl2(LONG_MAX, -1)	== LONG_MAX - 1);
+	assert_true(addsl2(LONG_MIN, 1)		== LONG_MIN + 1);
+	assert_true(addsl2(LONG_MIN, LONG_MAX)	== LONG_MIN + LONG_MAX);
+	assert_true(addsl2(0, 0)		== 0);
 }
 
 
 static void
-test_addsl_underflow(void **state)
+test_addsl_2_underflow(void **state)
 {
-	assert_true(addsl(LONG_MIN, -1)		== LONG_MIN);
-	assert_true(addsl(LONG_MIN + 3, -7)	== LONG_MIN);
-	assert_true(addsl(LONG_MIN, LONG_MIN)	== LONG_MIN);
+	assert_true(addsl2(LONG_MIN, -1)	== LONG_MIN);
+	assert_true(addsl2(LONG_MIN + 3, -7)	== LONG_MIN);
+	assert_true(addsl2(LONG_MIN, LONG_MIN)	== LONG_MIN);
 }
 
 
 static void
-test_addsl_overflow(void **state)
+test_addsl_2_overflow(void **state)
 {
-	assert_true(addsl(LONG_MAX, 1)		== LONG_MAX);
-	assert_true(addsl(LONG_MAX - 3, 7)	== LONG_MAX);
-	assert_true(addsl(LONG_MAX, LONG_MAX)	== LONG_MAX);
+	assert_true(addsl2(LONG_MAX, 1)		== LONG_MAX);
+	assert_true(addsl2(LONG_MAX - 3, 7)	== LONG_MAX);
+	assert_true(addsl2(LONG_MAX, LONG_MAX)	== LONG_MAX);
 }
 
 
 static void
-test_addsl3_ok(void **state)
+test_addsl_3_ok(void **state)
 {
 	assert_true(addsl3(1, 2, 3)		== 1 + 2 + 3);
 	assert_true(addsl3(LONG_MIN, -3, 4)	== LONG_MIN + 4 - 3);
@@ -80,7 +80,7 @@ test_addsl3_ok(void **state)
 
 
 static void
-test_addsl3_underflow(void **state)
+test_addsl_3_underflow(void **state)
 {
 	assert_true(addsl3(LONG_MIN, 2, -3)	== LONG_MIN);
 	assert_true(addsl3(LONG_MIN, -1, 0)	== LONG_MIN);
@@ -88,7 +88,7 @@ test_addsl3_underflow(void **state)
 
 
 static void
-test_addsl3_overflow(void **state)
+test_addsl_3_overflow(void **state)
 {
 	assert_true(addsl3(LONG_MAX, -1, 2)	== LONG_MAX);
 	assert_true(addsl3(LONG_MAX, +1, 0)	== LONG_MAX);