From ad0d6509a761154c113e040a82ad78e72a3ccf30 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 17 Mar 2003 22:56:13 +0000 Subject: Merge from HEAD: - Make ReadDirName return a const char*. - Consequential changes from that - mark our fstring/pstring assumptions in function prototypes Andrew Bartlett (This used to be commit 10b53d7c6fd77f23433dd2ef12bb14b227147a48) --- source3/smbd/filename.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/smbd/filename.c') diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c index 7d3527402e..ad707a2b9d 100644 --- a/source3/smbd/filename.c +++ b/source3/smbd/filename.c @@ -39,7 +39,7 @@ static BOOL scan_directory(const char *path, char *name,size_t maxlength, This needs to be careful about whether we are case sensitive. ****************************************************************************/ -static BOOL fname_equal(char *name1, char *name2) +static BOOL fname_equal(const char *name1, const char *name2) { /* Normal filename handling */ if (case_sensitive) @@ -52,7 +52,7 @@ static BOOL fname_equal(char *name1, char *name2) Mangle the 2nd name and check if it is then equal to the first name. ****************************************************************************/ -static BOOL mangled_equal(char *name1, const char *name2, int snum) +static BOOL mangled_equal(const char *name1, const char *name2, int snum) { pstring tmpname; @@ -439,7 +439,7 @@ static BOOL scan_directory(const char *path, char *name, size_t maxlength, connection_struct *conn,BOOL docache) { void *cur_dir; - char *dname; + const char *dname; BOOL mangled; mangled = mangle_is_mangled(name); -- cgit