Changeset 2b3dd78 in mainline for uspace/lib/posix/src/strings.c

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• uspace/lib/posix/src/strings.c (moved) (moved from uspace/lib/posix/source/strings.c ) (10 diffs)

uspace/lib/posix/src/strings.c

@@ -34 +34 @@
  */
 
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
-
 #include "internal/common.h"
 #include "posix/strings.h"
@@ -44 +41 @@
 
 #include "libc/mem.h"
+#include "libc/str.h"
 
 /**
@@ -51 +49 @@
  * @return Index of first set bit. Bits are numbered starting at one.
  */
-int posix_ffs(int i)
+int ffs(int i)
 {
         if (i == 0) {
@@ -91 +89 @@
  *     or 0 if strings have the same content.
  */
-int posix_strcasecmp(const char *s1, const char *s2)
+int strcasecmp(const char *s1, const char *s2)
 {
-        return posix_strncasecmp(s1, s2, STR_NO_LIMIT);
+        return strncasecmp(s1, s2, STR_NO_LIMIT);
 }
 
@@ -105 +103 @@
  *     or 0 if strings have the same content.
  */
-int posix_strncasecmp(const char *s1, const char *s2, size_t n)
+int strncasecmp(const char *s1, const char *s2, size_t n)
 {
         for (size_t i = 0; i < n; ++i) {
@@ -130 +128 @@
  *     zero. Otherwise return non-zero.
  */
-int posix_bcmp(const void *mem1, const void *mem2, size_t n)
+int bcmp(const void *mem1, const void *mem2, size_t n)
 {
         return memcmp(mem1, mem2, n);
@@ -142 +140 @@
  * @param n Number of bytes to copy.
  */
-void posix_bcopy(const void *src, void *dest, size_t n)
+void bcopy(const void *src, void *dest, size_t n)
 {
         /* Note that memmove has different order of arguments. */
@@ -154 +152 @@
  * @param n Number of bytes to reset.
  */
-void posix_bzero(void *mem, size_t n)
+void bzero(void *mem, size_t n)
 {
         memset(mem, 0, n);
@@ -167 +165 @@
  *     NULL pointer otherwise.
  */
-char *posix_index(const char *s, int c)
+char *index(const char *s, int c)
 {
-        return posix_strchr(s, c);
+        return strchr(s, c);
 }
 
@@ -180 +178 @@
  *     NULL pointer otherwise.
  */
-char *posix_rindex(const char *s, int c)
+char *rindex(const char *s, int c)
 {
-        return posix_strrchr(s, c);
+        return strrchr(s, c);
 }