Changeset 904b1bc in mainline for uspace/lib/posix/src/fnmatch.c

Timestamp:

2018-05-22T10:36:58Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a4eb3ba2

Parents:

4f8772d4

git-author:

Jiri Svoboda <jiri@…> (2018-05-21 17:36:30)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-22 10:36:58)

Message:

Fix remaining ccheck issues.

File:

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

uspace/lib/posix/src/fnmatch.c

@@ -33 +33 @@
  */
 
-/* This file contains an implementation of the fnmatch() pattern matching
+/*
+ * This file contains an implementation of the fnmatch() pattern matching
  * function. There is more code than necessary to account for the possibility
  * of adding POSIX-like locale support to the system in the future. Functions
@@ -54 +55 @@
 #define INVALID_PATTERN -1
 
-/* Type for collating element, simple identity with characters now,
+/*
+ * Type for collating element, simple identity with characters now,
  * but may be extended for better locale support.
  */
@@ -70 +72 @@
  * @return Matching collating element or COLL_ELM_INVALID.
  */
-static coll_elm_t _coll_elm_get(const char* str)
+static coll_elm_t _coll_elm_get(const char *str)
 {
         if (str[0] == '\0' || str[1] != '\0') {
@@ -306 +308 @@
 }
 
-/**
- * Matches the beginning of the given string against a bracket expression
- * the pattern begins with.
- *
- * @param pattern Pointer to the beginning of a bracket expression in a pattern.
- *     On success, the pointer is moved to the first character after the
- *     bracket expression.
- * @param str Unmatched part of the string.
- * @param flags Flags given to fnmatch().
- * @return INVALID_PATTERN if the pattern is invalid, 0 if there is no match
- *     or the number of matched characters on success.
- */
-static int _match_bracket_expr(const char **pattern, const char *str, int flags)
-{
-        const bool pathname = (flags & FNM_PATHNAME) != 0;
-        const bool special_period = (flags & FNM_PERIOD) != 0;
-        const char *p = *pattern;
-        bool negative = false;
-        int matched = 0;
-
-        #define _matched(match) { \
+#define _matched(match) { \
                 int _match = match; \
                 if (_match < 0) { \
@@ -337 +319 @@
         }
 
+/**
+ * Matches the beginning of the given string against a bracket expression
+ * the pattern begins with.
+ *
+ * @param pattern Pointer to the beginning of a bracket expression in a pattern.
+ *     On success, the pointer is moved to the first character after the
+ *     bracket expression.
+ * @param str Unmatched part of the string.
+ * @param flags Flags given to fnmatch().
+ * @return INVALID_PATTERN if the pattern is invalid, 0 if there is no match
+ *     or the number of matched characters on success.
+ */
+static int _match_bracket_expr(const char **pattern, const char *str, int flags)
+{
+        const bool pathname = (flags & FNM_PATHNAME) != 0;
+        const bool special_period = (flags & FNM_PERIOD) != 0;
+        const char *p = *pattern;
+        bool negative = false;
+        int matched = 0;
+
         assert(*p == '[');  /* calling code should ensure this */
         p++;
@@ -342 +344 @@
         if (*str == '\0' || (pathname && *str == '/') ||
             (pathname && special_period && *str == '.' && *(str - 1) == '/')) {
-                /* No bracket expression matches end of string,
+                /*
+                 * No bracket expression matches end of string,
                  * slash in pathname match or initial period with FNM_PERIOD
                  * option.
@@ -398 +401 @@
                 return negative ? 0 : matched;
         }
-
-        #undef _matched
 }
 
@@ -416 +417 @@
 static bool _partial_match(const char **pattern, const char **string, int flags)
 {
-        /* Only a single *-delimited subpattern is matched here.
+        /*
+         * Only a single *-delimited subpattern is matched here.
          * So in this function, '*' is understood as the end of pattern.
          */
@@ -473 +475 @@
 
                 if (*p == '\0') {
-                        /* End of pattern, must match end of string or
+                        /*
+                         * End of pattern, must match end of string or
                          * an end of subdirectory name (optional).
                          */
@@ -628 +631 @@
 #include <stdio.h>
 
+#define fnmatch_test(x) { if (x) printf("SUCCESS: "#x"\n"); else { printf("FAILED: "#x"\n"); fail++; } }
+#define match(s1, s2, flags) fnmatch_test(fnmatch(s1, s2, flags) == 0)
+#define nomatch(s1, s2, flags) fnmatch_test(fnmatch(s1, s2, flags) == FNM_NOMATCH)
+
 void __posix_fnmatch_test()
 {
         int fail = 0;
 
-        #undef assert
-        #define assert(x) { if (x) printf("SUCCESS: "#x"\n"); else { printf("FAILED: "#x"\n"); fail++; } }
-        #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);