mirror of
https://github.com/samba-team/samba.git
synced 2025-02-02 09:47:23 +03:00
r3971: fix compiler warnings
metze (This used to be commit 234166606dc86b9e98226cff94b3869ec173671e)
This commit is contained in:
parent
5cbc9574a6
commit
3308087bae
@ -1376,7 +1376,7 @@ static const char *readdirname(DIR *p)
|
||||
if (!p)
|
||||
return(NULL);
|
||||
|
||||
ptr = (struct smb_dirent *)readdir(p);
|
||||
ptr = (struct dirent *)readdir(p);
|
||||
if (!ptr)
|
||||
return(NULL);
|
||||
|
||||
|
@ -115,7 +115,7 @@ BOOL msrpc_gen(TALLOC_CTX *mem_ctx, DATA_BLOB *blob,
|
||||
break;
|
||||
case 'C':
|
||||
s = va_arg(ap, char *);
|
||||
pointers[i].data = s;
|
||||
pointers[i].data = (void *)s;
|
||||
pointers[i].length = strlen(s)+1;
|
||||
head_size += pointers[i].length;
|
||||
break;
|
||||
|
@ -129,7 +129,7 @@ uint_t ea_pull_struct(const DATA_BLOB *blob,
|
||||
return 0;
|
||||
}
|
||||
|
||||
ea->name.s = talloc_strndup(mem_ctx, blob->data+4, nlen);
|
||||
ea->name.s = talloc_strndup(mem_ctx, (const char *)(blob->data+4), nlen);
|
||||
ea->name.private_length = nlen;
|
||||
ea->value = data_blob_talloc(mem_ctx, NULL, vlen+1);
|
||||
if (!ea->value.data) return 0;
|
||||
|
@ -56,8 +56,8 @@ NTSTATUS smb_raw_trans2_recv(struct smbcli_request *req,
|
||||
{
|
||||
int total_data=0;
|
||||
int total_param=0;
|
||||
char *tdata;
|
||||
char *tparam;
|
||||
uint8_t *tdata;
|
||||
uint8_t *tparam;
|
||||
|
||||
parms->out.data.length = 0;
|
||||
parms->out.data.data = NULL;
|
||||
|
@ -74,7 +74,7 @@ static NTSTATUS print_ioctl(struct ntvfs_module_context *ntvfs,
|
||||
|
||||
data_blob_clear(&io->ioctl.out.blob);
|
||||
|
||||
p = io->ioctl.out.blob.data;
|
||||
p = (char *)io->ioctl.out.blob.data;
|
||||
SSVAL(p,0, 1 /* REWRITE: fsp->rap_print_jobid */);
|
||||
push_string(p+2, lp_netbios_name(), 15, STR_TERMINATE|STR_ASCII);
|
||||
push_string(p+18, lp_servicename(req->tcon->service), 13, STR_TERMINATE|STR_ASCII);
|
||||
|
@ -56,7 +56,7 @@ void secrets_shutdown(void)
|
||||
BOOL secrets_init(void)
|
||||
{
|
||||
pstring fname;
|
||||
char dummy;
|
||||
uint8_t dummy;
|
||||
|
||||
if (tdb)
|
||||
return True;
|
||||
|
@ -92,7 +92,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
|
||||
io->ntcreatex.in.ea_list = NULL;
|
||||
|
||||
req_pull_string(req, &io->ntcreatex.in.fname,
|
||||
params + 54,
|
||||
(const char *)(params + 54),
|
||||
trans->in.params.length - 54,
|
||||
STR_NO_RANGE_CHECK | STR_TERMINATE);
|
||||
if (!io->ntcreatex.in.fname) {
|
||||
@ -356,7 +356,7 @@ void reply_nttrans(struct smbsrv_request *req)
|
||||
uint16_t param_count, data_count;
|
||||
uint16_t params_left, data_left;
|
||||
uint16_t param_total, data_total;
|
||||
char *params, *data;
|
||||
uint8_t *params, *data;
|
||||
NTSTATUS status;
|
||||
|
||||
/* parse request */
|
||||
|
@ -666,7 +666,7 @@ static NTSTATUS trans2_fileinfo_fill(struct smbsrv_request *req, struct smb_tran
|
||||
|
||||
for (i=0;i<st->stream_info.out.num_streams;i++) {
|
||||
uint16_t data_size = trans->out.data.length;
|
||||
char *data;
|
||||
uint8_t *data;
|
||||
|
||||
trans2_grow_data(req, trans, data_size + 24);
|
||||
data = trans->out.data.data + data_size;
|
||||
@ -957,7 +957,7 @@ static void find_fill_info(struct smbsrv_request *req,
|
||||
struct find_state *state,
|
||||
union smb_search_data *file)
|
||||
{
|
||||
char *data;
|
||||
uint8_t *data;
|
||||
uint_t ofs = trans->out.data.length;
|
||||
|
||||
switch (state->level) {
|
||||
@ -1157,7 +1157,7 @@ static NTSTATUS trans2_findfirst(struct smbsrv_request *req, struct smb_trans2 *
|
||||
union smb_search_first search;
|
||||
NTSTATUS status;
|
||||
uint16_t level;
|
||||
char *param;
|
||||
uint8_t *param;
|
||||
struct find_state state;
|
||||
|
||||
/* make sure we got all the parameters */
|
||||
@ -1218,7 +1218,7 @@ static NTSTATUS trans2_findnext(struct smbsrv_request *req, struct smb_trans2 *t
|
||||
union smb_search_next search;
|
||||
NTSTATUS status;
|
||||
uint16_t level;
|
||||
char *param;
|
||||
uint8_t *param;
|
||||
struct find_state state;
|
||||
|
||||
/* make sure we got all the parameters */
|
||||
@ -1322,7 +1322,7 @@ void reply_trans_generic(struct smbsrv_request *req, uint8_t command)
|
||||
uint16_t param_count, data_count;
|
||||
uint16_t params_left, data_left;
|
||||
uint16_t param_total, data_total;
|
||||
char *params, *data;
|
||||
uint8_t *params, *data;
|
||||
NTSTATUS status;
|
||||
|
||||
/* parse request */
|
||||
|
@ -48,7 +48,7 @@ check for existance of a trans2 call
|
||||
****************************************************************************/
|
||||
static NTSTATUS try_trans2(struct smbcli_state *cli,
|
||||
int op,
|
||||
char *param, char *data,
|
||||
uint8_t *param, uint8_t *data,
|
||||
int param_len, int data_len,
|
||||
int *rparam_len, int *rdata_len)
|
||||
{
|
||||
@ -85,7 +85,7 @@ static NTSTATUS try_trans2(struct smbcli_state *cli,
|
||||
static NTSTATUS try_trans2_len(struct smbcli_state *cli,
|
||||
const char *format,
|
||||
int op, int level,
|
||||
char *param, char *data,
|
||||
uint8_t *param, uint8_t *data,
|
||||
int param_len, int *data_len,
|
||||
int *rparam_len, int *rdata_len)
|
||||
{
|
||||
@ -123,7 +123,7 @@ static BOOL trans2_op_exists(struct smbcli_state *cli, int op)
|
||||
int data_len = 0;
|
||||
int param_len = 0;
|
||||
int rparam_len, rdata_len;
|
||||
pstring param, data;
|
||||
uint8_t param[1024], data[1024];
|
||||
NTSTATUS status1, status2;
|
||||
|
||||
memset(data, 0, sizeof(data));
|
||||
@ -158,7 +158,7 @@ static BOOL scan_trans2(struct smbcli_state *cli, int op, int level,
|
||||
int data_len = 0;
|
||||
int param_len = 0;
|
||||
int rparam_len, rdata_len;
|
||||
pstring param, data;
|
||||
uint8_t param[1024], data[1024];
|
||||
NTSTATUS status;
|
||||
|
||||
memset(data, 0, sizeof(data));
|
||||
@ -324,7 +324,7 @@ check for existence of a nttrans call
|
||||
****************************************************************************/
|
||||
static NTSTATUS try_nttrans(struct smbcli_state *cli,
|
||||
int op,
|
||||
char *param, char *data,
|
||||
uint8_t *param, uint8_t *data,
|
||||
int param_len, int data_len,
|
||||
int *rparam_len, int *rdata_len)
|
||||
{
|
||||
@ -367,7 +367,7 @@ static NTSTATUS try_nttrans(struct smbcli_state *cli,
|
||||
static NTSTATUS try_nttrans_len(struct smbcli_state *cli,
|
||||
const char *format,
|
||||
int op, int level,
|
||||
char *param, char *data,
|
||||
uint8_t *param, uint8_t *data,
|
||||
int param_len, int *data_len,
|
||||
int *rparam_len, int *rdata_len)
|
||||
{
|
||||
@ -405,7 +405,7 @@ static BOOL scan_nttrans(struct smbcli_state *cli, int op, int level,
|
||||
int data_len = 0;
|
||||
int param_len = 0;
|
||||
int rparam_len, rdata_len;
|
||||
pstring param, data;
|
||||
uint8_t param[1024], data[1024];
|
||||
NTSTATUS status;
|
||||
|
||||
memset(data, 0, sizeof(data));
|
||||
|
Loading…
x
Reference in New Issue
Block a user