Changeset 2498b95 in mainline

Timestamp:

2018-06-25T15:49:26Z (6 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

Files:

• bithenge/src/helenos/common.h (modified) (1 diff)
• c/Makefile (modified) (1 diff)
• c/generic/mem.c (modified) (2 diffs)
• c/include/mem.h (modified) (2 diffs)
• c/test/main.c (modified) (1 diff)
• c/test/mem.c (added)
• posix/include/posix/string.h (modified) (4 diffs)
• posix/src/string.c (modified) (1 diff)

uspace/lib/bithenge/src/helenos/common.h

@@ -73 +73 @@
 }
 
-static inline void *memchr(const void *s, int c, size_t n)
-{
-        for (size_t i = 0; i < n; i++)
-                if (((char *)s)[i] == c)
-                        return (void *)(s + i);
-        return NULL;
-}
-
 static inline errno_t bithenge_parse_int(const char *start, bithenge_int_t *result)
 {

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);

uspace/lib/posix/include/posix/string.h

@@ -36 +36 @@
 #ifndef POSIX_STRING_H_
 #define POSIX_STRING_H_
-
-#include "sys/types.h"
-
 /*
  * TODO: not implemented due to missing locale support
@@ -48 +45 @@
 
 #include <_bits/NULL.h>
+#include <_bits/size_t.h>
 
-/*
- * These are the same as in HelenOS libc.
- * It would be possible to directly include <str.h> and <mem.h> but
- * it is better not to pollute POSIX namespace with other functions
- * defined in that header.
- *
- * Because libposix is always linked with libc, providing only these
- * forward declarations ought to be enough.
- */
-
-/* From mem.h */
-// #define bzero(ptr, len)  memset((ptr), 0, (len))
-extern void *memset(void *, int, size_t)
-    __attribute__((nonnull(1)));
-extern void *memcpy(void *, const void *, size_t)
-    __attribute__((nonnull(1, 2)));
-extern void *memmove(void *, const void *, size_t)
-    __attribute__((nonnull(1, 2)));
-
+#include "libc/mem.h"
 
 /* Copying and Concatenation */
@@ -80 +60 @@
 extern char *strndup(const char *s, size_t n);
 
-/* String/Array Comparison */
-extern int memcmp(const void *mem1, const void *mem2, size_t n);
+/* String Comparison */
 extern int strcmp(const char *s1, const char *s2);
 extern int strncmp(const char *s1, const char *s2, size_t n);
 
 /* Search Functions */
-extern void *memchr(const void *mem, int c, size_t n);
 extern char *strchr(const char *s, int c);
 extern char *strrchr(const char *s, int c);
@@ -122 +100 @@
 #endif
 
-
 #endif  // POSIX_STRING_H_
 

uspace/lib/posix/src/string.c

@@ -288 +288 @@
 
         return 0;
-}
-
-/**
- * Find byte in memory.
- *
- * @param mem Memory area in which to look for the byte.
- * @param c Byte to look for.
- * @param n Maximum number of bytes to be inspected.
- * @return Pointer to the specified byte on success,
- *     NULL pointer otherwise.
- */
-void *memchr(const void *mem, int c, size_t n)
-{
-        assert(mem != NULL);
-
-        const unsigned char *s = mem;
-
-        for (size_t i = 0; i < n; ++i) {
-                if (s[i] == (unsigned char) c) {
-                        return (void *) &s[i];
-                }
-        }
-        return NULL;
 }