aboutsummaryrefslogtreecommitdiffstats
path: root/memptoupper.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2024-08-18 09:58:23 +0200
committerMattias Andrée <maandree@kth.se>2024-08-18 09:58:23 +0200
commita69f0f613687edf6c1f1ee83b462f77e8ea3c9a9 (patch)
treed976683461a0f427d2f1ef79a8732a048dd0c67b /memptoupper.c
parentMerge tag '1.3' into since (diff)
parentUpdate VERSION_MINOR (diff)
downloadlibsimple-a69f0f613687edf6c1f1ee83b462f77e8ea3c9a9.tar.gz
libsimple-a69f0f613687edf6c1f1ee83b462f77e8ea3c9a9.tar.bz2
libsimple-a69f0f613687edf6c1f1ee83b462f77e8ea3c9a9.tar.xz
Merge tag '1.4' into since
Version 1.4
Diffstat (limited to '')
-rw-r--r--memptoupper.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/memptoupper.c b/memptoupper.c
index f9798f4..1ad61ce 100644
--- a/memptoupper.c
+++ b/memptoupper.c
@@ -1,5 +1,5 @@
/* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
#ifndef TEST
@@ -10,17 +10,17 @@ libsimple_memptoupper(void *d_, const void *s_, size_t n)
const char *s = s_;
if (d == s) {
for (; n; d++, n--)
- *d = toupper(*d);
+ *d = (char)toupper(*d);
return d;
} else if (d < s) {
for (; n; d++, s++, n--)
- *d = toupper(*s);
+ *d = (char)toupper(*s);
return d;
} else {
ret = &d[n];
while (n) {
n--;
- d[n] = toupper(s[n]);
+ d[n] = (char)toupper(s[n]);
}
return ret;
}
@@ -44,15 +44,6 @@ main(void)
stpcpy(buf, "abcdeABCDE12345");
assert(libsimple_memptoupper(&buf[0], &buf[0], 16) == &buf[16]);
assert(!strcmp(buf, "ABCDEABCDE12345"));
- stpcpy(buf, "abcdeABCDE12345");
- assert(!strcmpnul(libsimple_memtoupper(&buf[3], &buf[0], 16), "ABCDEABCDE12345"));
- assert(!strcmp(buf, "abcABCDEABCDE12345"));
- stpcpy(buf, "abcdeABCDE12345");
- assert(!strcmpnul(libsimple_memtoupper(&buf[0], &buf[3], 13), "DEABCDE12345"));
- assert(!strcmp(buf, "DEABCDE12345"));
- stpcpy(buf, "abcdeABCDE12345");
- assert(!strcmpnul(libsimple_memtoupper(&buf[0], &buf[0], 16), "ABCDEABCDE12345"));
- assert(!strcmp(buf, "ABCDEABCDE12345"));
return 0;
}