Changeset 2498b95 in mainline for uspace/lib/posix/include/posix/string.h

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.

File:

• uspace/lib/posix/include/posix/string.h (modified) (4 diffs)

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_