sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

r23067: use 'const union smb_search_data *file' also in the server code to get rid

Browse Source 
of compiler warnings in the cifs backend

metze
(This used to be commit 34ef07b1f5acdad27edd80de8de4c6de7f879f9b)
This commit is contained in:
Stefan Metzmacher 2007-05-22 09:25:58 +00:00 committed by Gerald (Jerry) Carter
parent 3527a578ba
commit 42c1ef4025
13 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/ntvfs/cifs/vfs_cifs.c
View File

@ -920,7 +920,7 @@ static NTSTATUS cvfs_lpq(struct ntvfs_module_context *ntvfs,
static NTSTATUS cvfs_search_first(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct cvfs_private *private = ntvfs->private_data;
@ -933,7 +933,7 @@ static NTSTATUS cvfs_search_first(struct ntvfs_module_context *ntvfs,
static NTSTATUS cvfs_search_next(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct cvfs_private *private = ntvfs->private_data;

4
source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c
View File

@ -830,7 +830,7 @@ static NTSTATUS cifspsx_lpq(struct ntvfs_module_context *ntvfs,
static NTSTATUS cifspsx_search_first(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct cifspsx_dir *dir;
int i;
@ -904,7 +904,7 @@ static NTSTATUS cifspsx_search_first(struct ntvfs_module_context *ntvfs,
static NTSTATUS cifspsx_search_next(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct cifspsx_dir *dir;
int i;

4
source4/ntvfs/ipc/vfs_ipc.c
View File

@ -669,7 +669,7 @@ static NTSTATUS ipc_lpq(struct ntvfs_module_context *ntvfs,
static NTSTATUS ipc_search_first(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
return NT_STATUS_ACCESS_DENIED;
}
@ -680,7 +680,7 @@ static NTSTATUS ipc_search_first(struct ntvfs_module_context *ntvfs,
static NTSTATUS ipc_search_next(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
return NT_STATUS_ACCESS_DENIED;
}

4
source4/ntvfs/nbench/vfs_nbench.c
View File

@ -842,7 +842,7 @@ static void nbench_search_first_send(struct ntvfs_request *req)
static NTSTATUS nbench_search_first(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
NTSTATUS status;
@ -864,7 +864,7 @@ static void nbench_search_next_send(struct ntvfs_request *req)
static NTSTATUS nbench_search_next(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
NTSTATUS status;

4
source4/ntvfs/ntvfs.h
View File

@ -92,11 +92,11 @@ struct ntvfs_ops {
NTSTATUS (*search_first)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_search_first *io, void *private,
BOOL (*callback)(void *private, union smb_search_data *file));
BOOL (*callback)(void *private, const union smb_search_data *file));
NTSTATUS (*search_next)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_search_next *io, void *private,
BOOL (*callback)(void *private, union smb_search_data *file));
BOOL (*callback)(void *private, const union smb_search_data *file));
NTSTATUS (*search_close)(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_search_close *io);

8
source4/ntvfs/ntvfs_interface.c
View File

@ -150,7 +150,7 @@ _PUBLIC_ NTSTATUS ntvfs_copy(struct ntvfs_request *req, struct smb_copy *cp)
/* directory search */
_PUBLIC_ NTSTATUS ntvfs_search_first(struct ntvfs_request *req, union smb_search_first *io, void *private,
BOOL ntvfs_callback(void *private, union smb_search_data *file))
BOOL ntvfs_callback(void *private, const union smb_search_data *file))
{
struct ntvfs_module_context *ntvfs = req->ctx->modules;
if (!ntvfs->ops->search_first) {
@ -160,7 +160,7 @@ _PUBLIC_ NTSTATUS ntvfs_search_first(struct ntvfs_request *req, union smb_search
}
_PUBLIC_ NTSTATUS ntvfs_search_next(struct ntvfs_request *req, union smb_search_next *io, void *private,
BOOL ntvfs_callback(void *private, union smb_search_data *file))
BOOL ntvfs_callback(void *private, const union smb_search_data *file))
{
struct ntvfs_module_context *ntvfs = req->ctx->modules;
if (!ntvfs->ops->search_next) {
@ -470,7 +470,7 @@ _PUBLIC_ NTSTATUS ntvfs_next_open(struct ntvfs_module_context *ntvfs,
_PUBLIC_ NTSTATUS ntvfs_next_search_first(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_search_first *io, void *private,
BOOL (*callback)(void *private, union smb_search_data *file))
BOOL (*callback)(void *private, const union smb_search_data *file))
{
if (!ntvfs->next || !ntvfs->next->ops->search_first) {
return NT_STATUS_NOT_IMPLEMENTED;
@ -481,7 +481,7 @@ _PUBLIC_ NTSTATUS ntvfs_next_search_first(struct ntvfs_module_context *ntvfs,
_PUBLIC_ NTSTATUS ntvfs_next_search_next(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req,
union smb_search_next *io, void *private,
BOOL (*callback)(void *private, union smb_search_data *file))
BOOL (*callback)(void *private, const union smb_search_data *file))
{
if (!ntvfs->next || !ntvfs->next->ops->search_next) {
return NT_STATUS_NOT_IMPLEMENTED;

18
source4/ntvfs/posix/pvfs_search.c
View File

@ -238,7 +238,7 @@ static NTSTATUS pvfs_search_fill(struct pvfs_state *pvfs, TALLOC_CTX *mem_ctx,
enum smb_search_data_level level,
uint_t *reply_count,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct pvfs_dir *dir = search->dir;
NTSTATUS status;
@ -314,7 +314,7 @@ static void pvfs_search_cleanup(struct pvfs_state *pvfs)
static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct pvfs_dir *dir;
struct pvfs_state *pvfs = ntvfs->private_data;
@ -404,7 +404,7 @@ static NTSTATUS pvfs_search_first_old(struct ntvfs_module_context *ntvfs,
static NTSTATUS pvfs_search_next_old(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct pvfs_state *pvfs = ntvfs->private_data;
struct pvfs_search_state *search;
@ -453,7 +453,7 @@ static NTSTATUS pvfs_search_next_old(struct ntvfs_module_context *ntvfs,
static NTSTATUS pvfs_search_first_trans2(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct pvfs_dir *dir;
struct pvfs_state *pvfs = ntvfs->private_data;
@ -549,7 +549,7 @@ static NTSTATUS pvfs_search_first_trans2(struct ntvfs_module_context *ntvfs,
static NTSTATUS pvfs_search_next_trans2(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct pvfs_state *pvfs = ntvfs->private_data;
struct pvfs_search_state *search;
@ -610,7 +610,7 @@ static NTSTATUS pvfs_search_next_trans2(struct ntvfs_module_context *ntvfs,
static NTSTATUS pvfs_search_first_smb2(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, const struct smb2_find *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct pvfs_dir *dir;
struct pvfs_state *pvfs = ntvfs->private_data;
@ -713,7 +713,7 @@ static NTSTATUS pvfs_search_first_smb2(struct ntvfs_module_context *ntvfs,
static NTSTATUS pvfs_search_next_smb2(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, const struct smb2_find *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct pvfs_state *pvfs = ntvfs->private_data;
struct pvfs_search_state *search;
@ -766,7 +766,7 @@ static NTSTATUS pvfs_search_next_smb2(struct ntvfs_module_context *ntvfs,
NTSTATUS pvfs_search_first(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
switch (io->generic.level) {
case RAW_SEARCH_SEARCH:
@ -788,7 +788,7 @@ NTSTATUS pvfs_search_first(struct ntvfs_module_context *ntvfs,
NTSTATUS pvfs_search_next(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
switch (io->generic.level) {
case RAW_SEARCH_SEARCH:

4
source4/ntvfs/simple/vfs_simple.c
View File

@ -827,7 +827,7 @@ static NTSTATUS svfs_lpq(struct ntvfs_module_context *ntvfs,
static NTSTATUS svfs_search_first(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct svfs_dir *dir;
int i;
@ -901,7 +901,7 @@ static NTSTATUS svfs_search_first(struct ntvfs_module_context *ntvfs,
static NTSTATUS svfs_search_next(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
struct svfs_dir *dir;
int i;

4
source4/ntvfs/unixuid/vfs_unixuid.c
View File

@ -592,7 +592,7 @@ static NTSTATUS unixuid_lpq(struct ntvfs_module_context *ntvfs,
static NTSTATUS unixuid_search_first(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_first *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
NTSTATUS status;
@ -605,7 +605,7 @@ static NTSTATUS unixuid_search_first(struct ntvfs_module_context *ntvfs,
static NTSTATUS unixuid_search_next(struct ntvfs_module_context *ntvfs,
struct ntvfs_request *req, union smb_search_next *io,
void *search_private,
BOOL (*callback)(void *, union smb_search_data *))
BOOL (*callback)(void *, const union smb_search_data *))
{
NTSTATUS status;

2
source4/smb_server/blob.c
View File

@ -604,7 +604,7 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx,
NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx,
DATA_BLOB *blob,
enum smb_search_data_level level,
union smb_search_data *file,
const union smb_search_data *file,
int default_str_flags)
{
uint8_t *data;

4
source4/smb_server/smb/search.c
View File

@ -39,7 +39,7 @@ struct search_state {
fill a single entry in a search find reply
*/
static BOOL find_fill_info(struct smbsrv_request *req,
union smb_search_data *file)
const union smb_search_data *file)
{
uint8_t *p;
@ -66,7 +66,7 @@ static BOOL find_fill_info(struct smbsrv_request *req,
}
/* callback function for search first/next */
static BOOL find_callback(void *private, union smb_search_data *file)
static BOOL find_callback(void *private, const union smb_search_data *file)
{
struct search_state *state = (struct search_state *)private;

4
source4/smb_server/smb/trans2.c
View File

@ -695,7 +695,7 @@ struct find_state {
fill a single entry in a trans2 find reply
*/
static NTSTATUS find_fill_info(struct find_state *state,
union smb_search_data *file)
const union smb_search_data *file)
{
struct smbsrv_request *req = state->op->req;
struct smb_trans2 *trans = state->op->trans;
@ -791,7 +791,7 @@ static NTSTATUS find_fill_info(struct find_state *state,
}
/* callback function for trans2 findfirst/findnext */
static BOOL find_callback(void *private, union smb_search_data *file)
static BOOL find_callback(void *private, const union smb_search_data *file)
{
struct find_state *state = talloc_get_type(private, struct find_state);
struct smb_trans2 *trans = state->op->trans;

2
source4/smb_server/smb2/find.c
View File

@ -41,7 +41,7 @@ struct smb2srv_find_state {
};
/* callback function for SMB2 Find */
static BOOL smb2srv_find_callback(void *private, union smb_search_data *file)
static BOOL smb2srv_find_callback(void *private, const union smb_search_data *file)
{
struct smb2srv_find_state *state = talloc_get_type(private, struct smb2srv_find_state);
struct smb2_find *info = state->info;