summaryrefslogtreecommitdiff
path: root/source3/smbd/mangle.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-05-06 08:07:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:47 -0500
commit02e3717ee9e045d197d845489e84ac40083ca868 (patch)
treedddd1100fcec3249f31741b8564d635396873775 /source3/smbd/mangle.c
parent61ffe158f2d3f149b230cc31c4b58d7d025ab28d (diff)
downloadsamba-02e3717ee9e045d197d845489e84ac40083ca868.tar.gz
samba-02e3717ee9e045d197d845489e84ac40083ca868.tar.bz2
samba-02e3717ee9e045d197d845489e84ac40083ca868.zip
r6625: Remove another global variable left over from a long time ago (magic char).
Jeremy. (This used to be commit b1bfa9cb37deb22d1d08bc60ba44d61334f6446e)
Diffstat (limited to 'source3/smbd/mangle.c')
-rw-r--r--source3/smbd/mangle.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/source3/smbd/mangle.c b/source3/smbd/mangle.c
index 43becff69d..afc1ca12f0 100644
--- a/source3/smbd/mangle.c
+++ b/source3/smbd/mangle.c
@@ -67,29 +67,28 @@ static void mangle_init(void)
void mangle_reset_cache(void)
{
mangle_init();
-
mangle_fns->reset();
}
/*
see if a filename has come out of our mangling code
*/
-BOOL mangle_is_mangled(const char *s)
+BOOL mangle_is_mangled(const char *s, int snum)
{
- return mangle_fns->is_mangled(s);
+ return mangle_fns->is_mangled(s, snum);
}
/*
see if a filename matches the rules of a 8.3 filename
*/
-BOOL mangle_is_8_3(const char *fname, BOOL check_case)
+BOOL mangle_is_8_3(const char *fname, BOOL check_case, int snum)
{
- return mangle_fns->is_8_3(fname, check_case, False);
+ return mangle_fns->is_8_3(fname, check_case, False, snum);
}
-BOOL mangle_is_8_3_wildcards(const char *fname, BOOL check_case)
+BOOL mangle_is_8_3_wildcards(const char *fname, BOOL check_case, int snum)
{
- return mangle_fns->is_8_3(fname, check_case, True);
+ return mangle_fns->is_8_3(fname, check_case, True, snum);
}
/*
@@ -98,9 +97,9 @@ BOOL mangle_is_8_3_wildcards(const char *fname, BOOL check_case)
looking for a matching name if it doesn't. It should succeed most of the time
or there will be a huge performance penalty
*/
-BOOL mangle_check_cache(char *s, size_t maxlen)
+BOOL mangle_check_cache(char *s, size_t maxlen, int snum)
{
- return mangle_fns->check_cache(s, maxlen);
+ return mangle_fns->check_cache(s, maxlen, snum);
}
/*
@@ -120,5 +119,5 @@ void mangle_map(pstring OutName, BOOL need83, BOOL cache83, int snum)
/* invoke the inane "mangled map" code */
mangle_map_filename(OutName, snum);
- mangle_fns->name_map(OutName, need83, cache83, lp_defaultcase(snum));
+ mangle_fns->name_map(OutName, need83, cache83, lp_defaultcase(snum), snum);
}