summaryrefslogtreecommitdiff
path: root/lib/util
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-05-04 20:53:33 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-05-06 07:51:24 +0200
commit3892112e7b3143f808932771a7b71f4fd335f8cb (patch)
treefa5254ec26d309e3bda8c8c502363e36feb7f8f9 /lib/util
parentcad704e8368f6aba28889966a7382afc8b738928 (diff)
downloadsamba-3892112e7b3143f808932771a7b71f4fd335f8cb.tar.gz
samba-3892112e7b3143f808932771a7b71f4fd335f8cb.tar.bz2
samba-3892112e7b3143f808932771a7b71f4fd335f8cb.zip
lib/util Rename ms_fnmatch() to ms_fnmatch_protocol() to avoid dup symbol
This verison of the function takes a protcol as argument to determine matching rules. Andrew Bartlett
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/ms_fnmatch.c6
-rw-r--r--lib/util/util.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/util/ms_fnmatch.c b/lib/util/ms_fnmatch.c
index 73fb0e0966..d029fd6b00 100644
--- a/lib/util/ms_fnmatch.c
+++ b/lib/util/ms_fnmatch.c
@@ -154,7 +154,7 @@ static int ms_fnmatch_core(const char *p, const char *n,
return -1;
}
-int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol)
+int ms_fnmatch_protocol(const char *pattern, const char *string, enum protocol_types protocol)
{
int ret, count, i;
struct max_n *max_n = NULL;
@@ -192,7 +192,7 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
p[i] = '<';
}
}
- ret = ms_fnmatch(p, string, PROTOCOL_NT1);
+ ret = ms_fnmatch_protocol(p, string, PROTOCOL_NT1);
talloc_free(p);
return ret;
}
@@ -217,5 +217,5 @@ int ms_fnmatch(const char *pattern, const char *string, enum protocol_types prot
/** a generic fnmatch function - uses for non-CIFS pattern matching */
int gen_fnmatch(const char *pattern, const char *string)
{
- return ms_fnmatch(pattern, string, PROTOCOL_NT1);
+ return ms_fnmatch_protocol(pattern, string, PROTOCOL_NT1);
}
diff --git a/lib/util/util.h b/lib/util/util.h
index 64793022c0..b91b2eb1fa 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -777,11 +777,12 @@ enum protocol_types {
PROTOCOL_SMB2
};
-int ms_fnmatch(const char *pattern, const char *string, enum protocol_types protocol);
+#endif
+
+int ms_fnmatch_protocol(const char *pattern, const char *string, enum protocol_types protocol);
/** a generic fnmatch function - uses for non-CIFS pattern matching */
int gen_fnmatch(const char *pattern, const char *string);
-#endif
/* The following definitions come from lib/util/idtree.c */