diff options
Diffstat (limited to '')
| -rw-r--r-- | rawmemrelem.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/rawmemrelem.c b/rawmemrelem.c index 078aa05..d8507b3 100644 --- a/rawmemrelem.c +++ b/rawmemrelem.c @@ -4,37 +4,37 @@ void * -libsimple_rawmemrelem(const void *hay_, size_t hayn, const void *sub_, size_t subn) +libsimple_rawmemrelem(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; *--hay != sub;); + for (hay += n; *--hay != sub;); return hay; } case 2: { uint16_t *hay = (void *)hay_; uint16_t sub = *(uint16_t *)sub_; - for (hay += hayn; *--hay != sub;); + for (hay += n; *--hay != sub;); return hay; } case 4: { uint32_t *hay = (void *)hay_; uint32_t sub = *(uint32_t *)sub_; - for (hay += hayn; *--hay != sub;); + for (hay += n; *--hay != sub;); return hay; } case 8: { uint64_t *hay = (void *)hay_; uint64_t sub = *(uint64_t *)sub_; - for (hay += hayn; *--hay != sub;); + for (hay += n; *--hay != sub;); return hay; } default: @@ -42,9 +42,9 @@ libsimple_rawmemrelem(const void *hay_, size_t hayn, const void *sub_, size_t su char *hay = (void *)hay_; const char *sub = sub_; size_t i; - for (hay += hayn * subn;;) { - hay -= subn; - for (i = 0; i < subn; i++) + for (hay += n * width;;) { + hay -= width; + for (i = 0; i < width; i++) if (hay[i] != sub[i]) goto next; return hay; @@ -61,18 +61,18 @@ libsimple_rawmemrelem(const void *hay_, size_t hayn, const void *sub_, size_t su int main(void) { - assert(!strcmpnul(libsimple_rawmemrelem("12345634", 8, "", 0), "12345634")); - assert(!strcmpnul(libsimple_rawmemrelem("12345634", 8, "3", 1), "34")); - assert(!strcmpnul(libsimple_rawmemrelem("13456342", 8, "3", 1), "342")); - assert(!strcmpnul(libsimple_rawmemrelem("12345634", 4, "34", 2), "34")); - assert(!strcmpnul(libsimple_rawmemrelem("abcd1234abcd1234", 4, "1234", 4), "1234")); - assert(!strcmpnul(libsimple_rawmemrelem("abcdefgh12345678abcdefgh12345678", 4, "12345678", 8), "12345678")); - assert(!strcmpnul(libsimple_rawmemrelem("abc123abc123", 4, "123", 3), "123")); + assert(!strcmpnul(libsimple_rawmemrelem("12345634", "", 0, 8), "12345634")); + assert(!strcmpnul(libsimple_rawmemrelem("12345634", "3", 1, 8), "34")); + assert(!strcmpnul(libsimple_rawmemrelem("13456342", "3", 1, 8), "342")); + assert(!strcmpnul(libsimple_rawmemrelem("12345634", "34", 2, 4), "34")); + assert(!strcmpnul(libsimple_rawmemrelem("abcd1234abcd1234", "1234", 4, 4), "1234")); + assert(!strcmpnul(libsimple_rawmemrelem("abcdefgh12345678abcdefgh12345678", "12345678", 8, 4), "12345678")); + assert(!strcmpnul(libsimple_rawmemrelem("abc123abc123", "123", 3, 4), "123")); - assert(!strcmpnul(libsimple_rawmemrelem("-aa--a-a", 4, "a-", 2), "a--a-a")); - assert(!strcmpnul(libsimple_rawmemrelem("--aa----a--a", 4, "a--", 3), "a----a--a")); - assert(!strcmpnul(libsimple_rawmemrelem("---aa------a---a", 4, "a---", 4), "a------a---a")); - assert(!strcmpnul(libsimple_rawmemrelem("-------aa--------------a-------a", 4, "a-------", 8), "a--------------a-------a")); + assert(!strcmpnul(libsimple_rawmemrelem("-aa--a-a", "a-", 2, 4), "a--a-a")); + assert(!strcmpnul(libsimple_rawmemrelem("--aa----a--a", "a--", 3, 4), "a----a--a")); + assert(!strcmpnul(libsimple_rawmemrelem("---aa------a---a", "a---", 4, 4), "a------a---a")); + assert(!strcmpnul(libsimple_rawmemrelem("-------aa--------------a-------a", "a-------", 8, 4), "a--------------a-------a")); return 0; } |