From: Jeremy Allison <jra@samba.org>
Date: Sat, 25 Feb 2012 01:12:52 +0000 (-0800)
Subject: Make dptr_path() and dptr_wcard() const.
X-Git-Tag: tdb-1.2.10~632
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e54cf1538752fcb38fd9ce84345520c4d0001474;p=thirdparty%2Fsamba.git

Make dptr_path() and dptr_wcard() const.
---

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index d8e26f6912e..f3cc36e872e 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -215,7 +215,7 @@ static struct dptr_struct *dptr_get(struct smbd_server_connection *sconn,
  Get the dir path for a dir index.
 ****************************************************************************/
 
-char *dptr_path(struct smbd_server_connection *sconn, int key)
+const char *dptr_path(struct smbd_server_connection *sconn, int key)
 {
 	struct dptr_struct *dptr = dptr_get(sconn, key, false);
 	if (dptr)
@@ -227,7 +227,7 @@ char *dptr_path(struct smbd_server_connection *sconn, int key)
  Get the dir wcard for a dir index.
 ****************************************************************************/
 
-char *dptr_wcard(struct smbd_server_connection *sconn, int key)
+const char *dptr_wcard(struct smbd_server_connection *sconn, int key)
 {
 	struct dptr_struct *dptr = dptr_get(sconn, key, false);
 	if (dptr)
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 8124ee9de84..4ec91a11dbf 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -189,8 +189,8 @@ bool make_dir_struct(TALLOC_CTX *ctx,
 			time_t date,
 			bool uc);
 bool init_dptrs(struct smbd_server_connection *sconn);
-char *dptr_path(struct smbd_server_connection *sconn, int key);
-char *dptr_wcard(struct smbd_server_connection *sconn, int key);
+const char *dptr_path(struct smbd_server_connection *sconn, int key);
+const char *dptr_wcard(struct smbd_server_connection *sconn, int key);
 uint16 dptr_attr(struct smbd_server_connection *sconn, int key);
 void dptr_close(struct smbd_server_connection *sconn, int *key);
 void dptr_closecnum(connection_struct *conn);
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index d2eff4d8f5d..5ee02c4278e 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -2773,14 +2773,12 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
 	directory = dptr_path(sconn, dptr_num);
 
 	/* Get the wildcard mask from the dptr */
-	if((p = dptr_wcard(sconn, dptr_num))== NULL) {
+	if((mask = dptr_wcard(sconn, dptr_num))== NULL) {
 		DEBUG(2,("dptr_num %d has no wildcard\n", dptr_num));
 		reply_nterror(req, STATUS_NO_MORE_FILES);
 		return;
 	}
 
-	mask = p;
-
 	/* Get the attr mask from the dptr */
 	dirtype = dptr_attr(sconn, dptr_num);