summaryrefslogtreecommitdiff
path: root/source3/smbd/filename.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-03-17 22:56:13 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-03-17 22:56:13 +0000
commitad0d6509a761154c113e040a82ad78e72a3ccf30 (patch)
tree13f4b6188945bfd1ada57e76c612f45a21bce5e2 /source3/smbd/filename.c
parentf06d1b240a0cc15bc50c907198c06fcd826d63b2 (diff)
downloadsamba-ad0d6509a761154c113e040a82ad78e72a3ccf30.tar.gz
samba-ad0d6509a761154c113e040a82ad78e72a3ccf30.tar.bz2
samba-ad0d6509a761154c113e040a82ad78e72a3ccf30.zip
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)
Diffstat (limited to 'source3/smbd/filename.c')
-rw-r--r--source3/smbd/filename.c6
1 files changed, 3 insertions, 3 deletions
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);