Merge branch 'rs/use-fspathncmp'

Code clean-up.

* rs/use-fspathncmp:
  dir: use fspathncmp() in pl_hashmap_cmp()

diff --combined dir.c
index 75429508200a9d8b591d23586ecab69fe6011a0d,7500ff1622e39cdb1f47ddd77dcd0713bfd0d32d..d604d1bab982980fd5506a0fae072bac3510a5ae
--- 1/dir.c
--- 2/dir.c
+++ b/dir.c
@@@ -655,10 -655,10 +655,10 @@@ void parse_path_pattern(const char **pa
        *patternlen = len;
  }
  
 -int pl_hashmap_cmp(const void *unused_cmp_data,
 +int pl_hashmap_cmp(const void *cmp_data UNUSED,
                   const struct hashmap_entry *a,
                   const struct hashmap_entry *b,
 -                 const void *key)
 +                 const void *key UNUSED)
  {
        const struct pattern_entry *ee1 =
                        container_of(a, struct pattern_entry, ent);
@@@ -669,9 -669,7 +669,7 @@@
                         ? ee1->patternlen
                         : ee2->patternlen;
  
-       if (ignore_case)
-               return strncasecmp(ee1->pattern, ee2->pattern, min_len);
-       return strncmp(ee1->pattern, ee2->pattern, min_len);
+       return fspathncmp(ee1->pattern, ee2->pattern, min_len);
  }
  
  static char *dup_and_filter_pattern(const char *pattern)
@@@ -1244,7 -1242,8 +1242,7 @@@ int match_basename(const char *basename
  
  int match_pathname(const char *pathname, int pathlen,
                   const char *base, int baselen,
 -                 const char *pattern, int prefix, int patternlen,
 -                 unsigned flags)
 +                 const char *pattern, int prefix, int patternlen)
  {
        const char *name;
        int namelen;
@@@ -1346,7 -1345,8 +1344,7 @@@ static struct path_pattern *last_matchi
                if (match_pathname(pathname, pathlen,
                                   pattern->base,
                                   pattern->baselen ? pattern->baselen - 1 : 0,
 -                                 exclude, prefix, pattern->patternlen,
 -                                 pattern->flags)) {
 +                                 exclude, prefix, pattern->patternlen)) {
                        res = pattern;
                        break;
                }