Changeset 2498b95 in mainline for uspace/lib/c

Timestamp:

2018-06-25T15:49:26Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fbfe59d

Parents:

bfe90b6

git-author:

Jiri Svoboda <jiri@…> (2018-06-24 19:48:37)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-25 15:49:26)

Message:

Move memchr to libc and add tests for other memxxx functions.

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• generic/mem.c (modified) (2 diffs)
• include/mem.h (modified) (2 diffs)
• test/main.c (modified) (1 diff)
• test/mem.c (added)

uspace/lib/c/Makefile

@@ -193 +193 @@
         test/fibril/timer.c \
         test/main.c \
+        test/mem.c \
         test/io/table.c \
         test/stdio/scanf.c \

uspace/lib/c/generic/mem.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -252 +252 @@
 }
 
+/** Search memory area.
+ *
+ * @param s Memory area
+ * @param c Character (byte) to search for
+ * @param n Size of memory area in bytes
+ *
+ * @return Pointer to the first occurrence of @a c in the first @a n
+ *         bytes of @a s or @c NULL if not found.
+ */
+void *memchr(const void *s, int c, size_t n)
+{
+        uint8_t *u = (uint8_t *) s;
+        unsigned char uc = (unsigned char) c;
+        size_t i;
+
+        for (i = 0; i < n; i++) {
+                if (u[i] == uc)
+                        return (void *) &u[i];
+        }
+
+        return NULL;
+}
+
 /** @}
  */

uspace/lib/c/include/mem.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +50 @@
 extern int memcmp(const void *, const void *, size_t)
     __attribute__((nonnull(1, 2)));
+extern void *memchr(const void *, int, size_t)
+    __attribute__((nonnull(1)));
 
 #endif

uspace/lib/c/test/main.c

@@ -34 +34 @@
 PCUT_IMPORT(circ_buf);
 PCUT_IMPORT(fibril_timer);
+PCUT_IMPORT(mem);
 PCUT_IMPORT(odict);
 PCUT_IMPORT(qsort);