summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2012-02-24 17:12:52 -0800
committerJeremy Allison <jra@samba.org>2012-02-24 17:12:52 -0800
commite54cf1538752fcb38fd9ce84345520c4d0001474 (patch)
treebb8825cbf338960fa11abb701d65bfd2f6bd3d24
parentc9ef08772214f1eab545b7ca5e0cb5bdbf8dd6ce (diff)
downloadsamba-e54cf1538752fcb38fd9ce84345520c4d0001474.tar.gz
samba-e54cf1538752fcb38fd9ce84345520c4d0001474.tar.bz2
samba-e54cf1538752fcb38fd9ce84345520c4d0001474.zip
Make dptr_path() and dptr_wcard() const.
-rw-r--r--source3/smbd/dir.c4
-rw-r--r--source3/smbd/proto.h4
-rw-r--r--source3/smbd/trans2.c4
3 files changed, 5 insertions, 7 deletions
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index d8e26f6912..f3cc36e872 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 8124ee9de8..4ec91a11db 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 d2eff4d8f5..5ee02c4278 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);