Fix consistence in memelem functions

Signed-off-by: Mattias Andrée <maandree@kth.se>

1 files changed, 35 insertions, 35 deletions

diff --git a/memrelem.c b/memrelem.c
index ca45136..5b9cf8f 100644
--- a/memrelem.c
+++ b/memrelem.c
@@ -4,16 +4,16 @@
 
 
 void *
-libsimple_memrelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
+libsimple_memrelem(const void *hay_, const void *sub_, size_t width, size_t n)
 {
-	switch (subn) {
+	switch (width) {
 	case 0:
 		return (void *)hay_;
 	case 1:
 		{
 			uint8_t *hay = (void *)hay_;
 			uint8_t sub = *(uint8_t *)sub_;
-			for (hay += hayn; hayn--;)
+			for (hay += n; n--;)
 				if (*--hay == sub)
 					return hay;
 			break;
@@ -22,7 +22,7 @@ libsimple_memrelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
 		{
 			uint16_t *hay = (void *)hay_;
 			uint16_t sub = *(uint16_t *)sub_;
-			for (hay += hayn; hayn--;)
+			for (hay += n; n--;)
 				if (*--hay == sub)
 					return hay;
 			break;
@@ -31,7 +31,7 @@ libsimple_memrelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
 		{
 			uint32_t *hay = (void *)hay_;
 			uint32_t sub = *(uint32_t *)sub_;
-			for (hay += hayn; hayn--;)
+			for (hay += n; n--;)
 				if (*--hay == sub)
 					return hay;
 			break;
@@ -40,7 +40,7 @@ libsimple_memrelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
 		{
 			uint64_t *hay = (void *)hay_;
 			uint64_t sub = *(uint64_t *)sub_;
-			for (hay += hayn; hayn--;)
+			for (hay += n; n--;)
 				if (*--hay == sub)
 					return hay;
 			break;
@@ -50,9 +50,9 @@ libsimple_memrelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
 			char *hay = (void *)hay_;
 			const char *sub = sub_;
 			size_t i;
-			for (hay += hayn * subn; hayn--;) {
-				hay -= subn;
-				for (i = 0; i < subn; i++)
+			for (hay += n * width; n--;) {
+				hay -= width;
+				for (i = 0; i < width; i++)
 					if (hay[i] != sub[i])
 						goto next;
 				return hay;
@@ -72,38 +72,38 @@ libsimple_memrelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
 int
 main(void)
 {
-	assert(!strcmpnul(libsimple_memrelem("12345634", 8, "", 0), "12345634"));
-	assert(!strcmpnul(libsimple_memrelem("12345634", 0, "", 0), "12345634"));
+	assert(!strcmpnul(libsimple_memrelem("12345634", "", 0, 8), "12345634"));
+	assert(!strcmpnul(libsimple_memrelem("12345634", "", 0, 0), "12345634"));
 
-	assert(!strcmpnul(libsimple_memrelem("12345634", 8, "3", 1), "34"));
-	assert(!libsimple_memrelem("12345634", 8, "x", 1));
-	assert(!strcmpnul(libsimple_memrelem("13456342", 8, "3", 1), "342"));
-	assert(!libsimple_memrelem("12345634", 0, "3", 1));
+	assert(!strcmpnul(libsimple_memrelem("12345634", "3", 1, 8), "34"));
+	assert(!libsimple_memrelem("12345634", "x", 1, 8));
+	assert(!strcmpnul(libsimple_memrelem("13456342", "3", 1, 8), "342"));
+	assert(!libsimple_memrelem("12345634", "3", 1, 0));
 
-	assert(!strcmpnul(libsimple_memrelem("12345634", 4, "34", 2), "34"));
-	assert(!libsimple_memrelem("12345634", 4, "xx", 2));
-	assert(!libsimple_memrelem("13456342", 4, "34", 2));
-	assert(!libsimple_memrelem("12345634", 0, "34", 2));
+	assert(!strcmpnul(libsimple_memrelem("12345634", "34", 2, 4), "34"));
+	assert(!libsimple_memrelem("12345634", "xx", 2, 4));
+	assert(!libsimple_memrelem("13456342", "34", 2, 4));
+	assert(!libsimple_memrelem("12345634", "34", 2, 0));
 
-	assert(!strcmpnul(libsimple_memrelem("abcd1234abcd1234", 4, "1234", 4), "1234"));
-	assert(!libsimple_memrelem("abcd1234abcd1234", 4, "zzzz", 4));
-	assert(!libsimple_memrelem("cd1234abcd1234ab", 4, "1234", 4));
-	assert(!libsimple_memrelem("abcd1234abcd1234", 0, "1234", 4));
+	assert(!strcmpnul(libsimple_memrelem("abcd1234abcd1234", "1234", 4, 4), "1234"));
+	assert(!libsimple_memrelem("abcd1234abcd1234", "zzzz", 4, 4));
+	assert(!libsimple_memrelem("cd1234abcd1234ab", "1234", 4, 4));
+	assert(!libsimple_memrelem("abcd1234abcd1234", "1234", 4, 0));
 
-	assert(!strcmpnul(libsimple_memrelem("abcdefgh12345678abcdefgh12345678", 4, "12345678", 8), "12345678"));
-	assert(!libsimple_memrelem("abcdefgh12345678abcdefgh12345678", 4, "zzzzzzzz", 8));
-	assert(!libsimple_memrelem("efgh12345678abcdefgh12345678abcd", 4, "12345678", 8));
-	assert(!libsimple_memrelem("abcdefgh12345678abcdefgh12345678", 0, "12345678", 8));
+	assert(!strcmpnul(libsimple_memrelem("abcdefgh12345678abcdefgh12345678", "12345678", 8, 4), "12345678"));
+	assert(!libsimple_memrelem("abcdefgh12345678abcdefgh12345678", "zzzzzzzz", 8, 4));
+	assert(!libsimple_memrelem("efgh12345678abcdefgh12345678abcd", "12345678", 8, 4));
+	assert(!libsimple_memrelem("abcdefgh12345678abcdefgh12345678", "12345678", 8, 0));
 
-	assert(!strcmpnul(libsimple_memrelem("abc123abc123", 4, "123", 3), "123"));
-	assert(!libsimple_memrelem("abc123abc123", 4, "zzz", 3));
-	assert(!libsimple_memrelem("bc123abc123a", 4, "123", 3));
-	assert(!libsimple_memrelem("abc123abc123", 0, "123", 3));
+	assert(!strcmpnul(libsimple_memrelem("abc123abc123", "123", 3, 4), "123"));
+	assert(!libsimple_memrelem("abc123abc123", "zzz", 3, 4));
+	assert(!libsimple_memrelem("bc123abc123a", "123", 3, 4));
+	assert(!libsimple_memrelem("abc123abc123", "123", 3, 0));
 
-	assert(!strcmpnul(libsimple_memrelem("-a-aa--a", 4, "a-", 2), "a--a"));
-	assert(!strcmpnul(libsimple_memrelem("--a--aa----a", 4, "a--", 3), "a----a"));
-	assert(!strcmpnul(libsimple_memrelem("---a---aa------a", 4, "a---", 4), "a------a"));
-	assert(!strcmpnul(libsimple_memrelem("-------a-------aa--------------a", 4, "a-------", 8), "a--------------a"));
+	assert(!strcmpnul(libsimple_memrelem("-a-aa--a", "a-", 2, 4), "a--a"));
+	assert(!strcmpnul(libsimple_memrelem("--a--aa----a", "a--", 3, 4), "a----a"));
+	assert(!strcmpnul(libsimple_memrelem("---a---aa------a", "a---", 4, 4), "a------a"));
+	assert(!strcmpnul(libsimple_memrelem("-------a-------aa--------------a", "a-------", 8, 4), "a--------------a"));
 
 	return 0;
 }