aboutsummaryrefslogtreecommitdiffstats
path: root/memelem.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--memelem.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/memelem.c b/memelem.c
index 29d6ed9..7d9231d 100644
--- a/memelem.c
+++ b/memelem.c
@@ -4,18 +4,18 @@
void *
-libsimple_memelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
+libsimple_memelem(const void *hay_, const void *sub_, size_t width, size_t n)
{
- switch (subn) {
+ switch (width) {
case 0:
return (void *)hay_;
case 1:
- return memchr(hay_, *(char *)sub_, hayn);
+ return memchr(hay_, *(char *)sub_, n);
case 2:
{
uint16_t *hay = (void *)hay_;
uint16_t sub = *(uint16_t *)sub_;
- for (; hayn--; hay++)
+ for (; n--; hay++)
if (*hay == sub)
return hay;
break;
@@ -24,7 +24,7 @@ libsimple_memelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
{
uint32_t *hay = (void *)hay_;
uint32_t sub = *(uint32_t *)sub_;
- for (; hayn--; hay++)
+ for (; n--; hay++)
if (*hay == sub)
return hay;
break;
@@ -33,7 +33,7 @@ libsimple_memelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
{
uint64_t *hay = (void *)hay_;
uint64_t sub = *(uint64_t *)sub_;
- for (; hayn--; hay++)
+ for (; n--; hay++)
if (*hay == sub)
return hay;
break;
@@ -43,8 +43,8 @@ libsimple_memelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
char *hay = (void *)hay_;
const char *sub = sub_;
size_t i;
- for (; hayn--; hay += subn) {
- for (i = 0; i < subn; i++)
+ for (; n--; hay += width) {
+ for (i = 0; i < width; i++)
if (hay[i] != sub[i])
goto next;
return hay;
@@ -64,38 +64,38 @@ libsimple_memelem(const void *hay_, size_t hayn, const void *sub_, size_t subn)
int
main(void)
{
- assert(!strcmpnul(libsimple_memelem("12345634", 8, "", 0), "12345634"));
- assert(!strcmpnul(libsimple_memelem("12345634", 0, "", 0), "12345634"));
+ assert(!strcmpnul(libsimple_memelem("12345634", "", 0, 8), "12345634"));
+ assert(!strcmpnul(libsimple_memelem("12345634", "", 0, 0), "12345634"));
- assert(!strcmpnul(libsimple_memelem("12345634", 8, "3", 1), "345634"));
- assert(!libsimple_memelem("12345634", 8, "x", 1));
- assert(!strcmpnul(libsimple_memelem("13456342", 8, "3", 1), "3456342"));
- assert(!libsimple_memelem("12345634", 0, "3", 1));
+ assert(!strcmpnul(libsimple_memelem("12345634", "3", 1, 8), "345634"));
+ assert(!libsimple_memelem("12345634", "x", 1, 8));
+ assert(!strcmpnul(libsimple_memelem("13456342", "3", 1, 8), "3456342"));
+ assert(!libsimple_memelem("12345634", "3", 1, 0));
- assert(!strcmpnul(libsimple_memelem("12345634", 4, "34", 2), "345634"));
- assert(!libsimple_memelem("12345634", 4, "xx", 2));
- assert(!libsimple_memelem("13456342", 4, "34", 2));
- assert(!libsimple_memelem("12345634", 0, "34", 2));
+ assert(!strcmpnul(libsimple_memelem("12345634", "34", 2, 4), "345634"));
+ assert(!libsimple_memelem("12345634", "xx", 2, 4));
+ assert(!libsimple_memelem("13456342", "34", 2, 4));
+ assert(!libsimple_memelem("12345634", "34", 2, 0));
- assert(!strcmpnul(libsimple_memelem("abcd1234abcd1234", 4, "1234", 4), "1234abcd1234"));
- assert(!libsimple_memelem("abcd1234abcd1234", 4, "zzzz", 4));
- assert(!libsimple_memelem("cd1234abcd1234ab", 4, "1234", 4));
- assert(!libsimple_memelem("abcd1234abcd1234", 0, "1234", 4));
+ assert(!strcmpnul(libsimple_memelem("abcd1234abcd1234", "1234", 4, 4), "1234abcd1234"));
+ assert(!libsimple_memelem("abcd1234abcd1234", "zzzz", 4, 4));
+ assert(!libsimple_memelem("cd1234abcd1234ab", "1234", 4, 4));
+ assert(!libsimple_memelem("abcd1234abcd1234", "1234", 4, 0));
- assert(!strcmpnul(libsimple_memelem("abcdefgh12345678abcdefgh12345678", 4, "12345678", 8), "12345678abcdefgh12345678"));
- assert(!libsimple_memelem("abcdefgh12345678abcdefgh12345678", 4, "zzzzzzzz", 8));
- assert(!libsimple_memelem("efgh12345678abcdefgh12345678abcd", 4, "12345678", 8));
- assert(!libsimple_memelem("abcdefgh12345678abcdefgh12345678", 0, "12345678", 8));
+ assert(!strcmpnul(libsimple_memelem("abcdefgh12345678abcdefgh12345678", "12345678", 8, 4), "12345678abcdefgh12345678"));
+ assert(!libsimple_memelem("abcdefgh12345678abcdefgh12345678", "zzzzzzzz", 8, 4));
+ assert(!libsimple_memelem("efgh12345678abcdefgh12345678abcd", "12345678", 8, 4));
+ assert(!libsimple_memelem("abcdefgh12345678abcdefgh12345678", "12345678", 8, 0));
- assert(!strcmpnul(libsimple_memelem("abc123abc123", 4, "123", 3), "123abc123"));
- assert(!libsimple_memelem("abc123abc123", 4, "zzz", 3));
- assert(!libsimple_memelem("bc123abc123a", 4, "123", 3));
- assert(!libsimple_memelem("abc123abc123", 0, "123", 3));
+ assert(!strcmpnul(libsimple_memelem("abc123abc123", "123", 3, 4), "123abc123"));
+ assert(!libsimple_memelem("abc123abc123", "zzz", 3, 4));
+ assert(!libsimple_memelem("bc123abc123a", "123", 3, 4));
+ assert(!libsimple_memelem("abc123abc123", "123", 3, 0));
- assert(!strcmpnul(libsimple_memelem("-a-aa--a", 4, "a-", 2), "a--a"));
- assert(!strcmpnul(libsimple_memelem("--a--aa----a", 4, "a--", 3), "a----a"));
- assert(!strcmpnul(libsimple_memelem("---a---aa------a", 4, "a---", 4), "a------a"));
- assert(!strcmpnul(libsimple_memelem("-------a-------aa--------------a", 4, "a-------", 8), "a--------------a"));
+ assert(!strcmpnul(libsimple_memelem("-a-aa--a", "a-", 2, 4), "a--a"));
+ assert(!strcmpnul(libsimple_memelem("--a--aa----a", "a--", 3, 4), "a----a"));
+ assert(!strcmpnul(libsimple_memelem("---a---aa------a", "a---", 4, 4), "a------a"));
+ assert(!strcmpnul(libsimple_memelem("-------a-------aa--------------a", "a-------", 8, 4), "a--------------a"));
return 0;
}