sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

Make dptr_path() and dptr_wcard() const.

Browse Source
This commit is contained in:
Jeremy Allison 2012-02-24 17:12:52 -08:00
parent c9ef087722
commit e54cf15387
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source3/smbd/dir.c
View File

@ -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)

4
source3/smbd/proto.h
View File

@ -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);

4
source3/smbd/trans2.c
View File

@ -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);