Const fixes by metze

Volker
(This used to be commit c0e35f3be8a33f19823826c5a84c885764c62508)

3 files changed, 8 insertions, 8 deletions

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 7ba8648156..a53a50a060 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -650,7 +650,7 @@ char *talloc_sub_advanced(TALLOC_CTX *mem_ctx,
 			const char *connectpath,
 			gid_t gid,
 			const char *smb_name,
-			char *str)
+			const char *str)
 {
 	char *a, *t;
        	a = alloc_sub_advanced(snum, user, connectpath, gid, smb_name, str);
@@ -662,7 +662,7 @@ char *talloc_sub_advanced(TALLOC_CTX *mem_ctx,
 
 char *alloc_sub_advanced(int snum, const char *user, 
 				  const char *connectpath, gid_t gid, 
-				  const char *smb_name, char *str)
+				  const char *smb_name, const char *str)
 {
 	char *a_string, *ret_string;
 	char *b, *p, *s, *t, *h;
@@ -736,14 +736,14 @@ void standard_sub_conn(connection_struct *conn, char *str, size_t len)
 			conn->gid, smb_user_name, str, len);
 }
 
-char *talloc_sub_conn(TALLOC_CTX *mem_ctx, connection_struct *conn, char *str)
+char *talloc_sub_conn(TALLOC_CTX *mem_ctx, connection_struct *conn, const char *str)
 {
 	return talloc_sub_advanced(mem_ctx, SNUM(conn), conn->user,
 			conn->connectpath, conn->gid,
 			smb_user_name, str);
 }
 
-char *alloc_sub_conn(connection_struct *conn, char *str)
+char *alloc_sub_conn(connection_struct *conn, const char *str)
 {
 	return alloc_sub_advanced(SNUM(conn), conn->user, conn->connectpath,
 			conn->gid, smb_user_name, str);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 95d3403a7c..eb790741d9 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -2345,9 +2345,9 @@ BOOL mask_match(const char *string, char *pattern, BOOL is_case_sensitive)
  Recursive routine that is called by unix_wild_match.
 *********************************************************/
 
-static BOOL unix_do_match(char *regexp, char *str)
+static BOOL unix_do_match(const char *regexp, const char *str)
 {
-	char *p;
+	const char *p;
 
 	for( p = regexp; *p && *str; ) {
 
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index 45c661edb7..80f243a168 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -287,7 +287,7 @@ static BOOL matchparam(const char **haystack_list, const char *needle)
 	}
 
 	for(i=0; haystack_list[i] ; i++) {
-		if(!unix_wild_match((char *)haystack_list[i], (char *)needle)) {
+		if(!unix_wild_match(haystack_list[i], needle)) {
 			return True;
 		}
 	}
@@ -333,7 +333,7 @@ static int recycle_unlink(vfs_handle_struct *handle, connection_struct *conn, co
 	BOOL exist;
 	int rc = -1;
 
-	repository = alloc_sub_conn(conn, (char *)recycle_repository(handle));
+	repository = alloc_sub_conn(conn, recycle_repository(handle));
 	ALLOC_CHECK(repository, done);
 	/* shouldn't we allow absolute path names here? --metze */
 	trim_string(repository, "/", "/");