Changeset 7f9df7b9 in mainline for uspace/lib/posix/src/fnmatch.c

Timestamp:

2018-01-22T22:42:57Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

7a08c70

Parents:

e0f47f5

Message:

Remove unnecessary symbol renaming from libposix.

File:

• uspace/lib/posix/src/fnmatch.c (modified) (6 diffs)

uspace/lib/posix/src/fnmatch.c

@@ -41 +41 @@
  * will be fairly straightforward.
  */
-
-#define LIBPOSIX_INTERNAL
-#define __POSIX_DEF__(x) posix_##x
 
 #include "libc/stdbool.h"
@@ -205 +202 @@
 {
         const struct _char_class *class = elem;
-        return posix_strcmp((const char *) key, class->name);
+        return strcmp((const char *) key, class->name);
 }
 
@@ -218 +215 @@
 {
         /* Search for class in the array of supported character classes. */
-        const struct _char_class *class = posix_bsearch(cname, _char_classes,
+        const struct _char_class *class = bsearch(cname, _char_classes,
             sizeof(_char_classes) / sizeof(struct _char_class),
             sizeof(struct _char_class), _class_compare);
@@ -582 +579 @@
 {
         assert(s != NULL);
-        char *result = posix_strdup(s);
+        char *result = strdup(s);
         for (char *i = result; *i != '\0'; ++i) {
                 *i = tolower(*i);
@@ -598 +595 @@
  * @return Zero if the string matches the pattern, FNM_NOMATCH otherwise.
  */
-int posix_fnmatch(const char *pattern, const char *string, int flags)
+int fnmatch(const char *pattern, const char *string, int flags)
 {
         assert(pattern != NULL);
@@ -637 +634 @@
         #undef assert
         #define assert(x) { if (x) printf("SUCCESS: "#x"\n"); else { printf("FAILED: "#x"\n"); fail++; } }
-        #define match(s1, s2, flags) assert(posix_fnmatch(s1, s2, flags) == 0)
-        #define nomatch(s1, s2, flags) assert(posix_fnmatch(s1, s2, flags) == FNM_NOMATCH)
+        #define match(s1, s2, flags) assert(fnmatch(s1, s2, flags) == 0)
+        #define nomatch(s1, s2, flags) assert(fnmatch(s1, s2, flags) == FNM_NOMATCH)
 
         static_assert(FNM_PATHNAME == FNM_FILE_NAME);