Author: metze Date: 2004-11-25 20:01:47 +0000 (Thu, 25 Nov 2004) New Revision: 3971
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3971 Log: fix compiler warnings metze Modified: branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c branches/SAMBA_4_0/source/libcli/raw/raweas.c branches/SAMBA_4_0/source/libcli/raw/rawtrans.c branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c branches/SAMBA_4_0/source/passdb/secrets.c branches/SAMBA_4_0/source/smb_server/nttrans.c branches/SAMBA_4_0/source/smb_server/trans2.c branches/SAMBA_4_0/source/torture/basic/scanner.c Changeset: Modified: branches/SAMBA_4_0/source/client/client.c =================================================================== --- branches/SAMBA_4_0/source/client/client.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/client/client.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -1376,7 +1376,7 @@ if (!p) return(NULL); - ptr = (struct smb_dirent *)readdir(p); + ptr = (struct dirent *)readdir(p); if (!ptr) return(NULL); Modified: branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c =================================================================== --- branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/libcli/auth/ntlmssp_parse.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -115,7 +115,7 @@ 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; Modified: branches/SAMBA_4_0/source/libcli/raw/raweas.c =================================================================== --- branches/SAMBA_4_0/source/libcli/raw/raweas.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/libcli/raw/raweas.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -129,7 +129,7 @@ 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; Modified: branches/SAMBA_4_0/source/libcli/raw/rawtrans.c =================================================================== --- branches/SAMBA_4_0/source/libcli/raw/rawtrans.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/libcli/raw/rawtrans.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -56,8 +56,8 @@ { 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; Modified: branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c =================================================================== --- branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/ntvfs/print/vfs_print.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -74,7 +74,7 @@ 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); Modified: branches/SAMBA_4_0/source/passdb/secrets.c =================================================================== --- branches/SAMBA_4_0/source/passdb/secrets.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/passdb/secrets.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -56,7 +56,7 @@ BOOL secrets_init(void) { pstring fname; - char dummy; + uint8_t dummy; if (tdb) return True; Modified: branches/SAMBA_4_0/source/smb_server/nttrans.c =================================================================== --- branches/SAMBA_4_0/source/smb_server/nttrans.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/smb_server/nttrans.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -92,7 +92,7 @@ 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 @@ 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 */ Modified: branches/SAMBA_4_0/source/smb_server/trans2.c =================================================================== --- branches/SAMBA_4_0/source/smb_server/trans2.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/smb_server/trans2.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -666,7 +666,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 */ Modified: branches/SAMBA_4_0/source/torture/basic/scanner.c =================================================================== --- branches/SAMBA_4_0/source/torture/basic/scanner.c 2004-11-25 19:59:08 UTC (rev 3970) +++ branches/SAMBA_4_0/source/torture/basic/scanner.c 2004-11-25 20:01:47 UTC (rev 3971) @@ -48,7 +48,7 @@ ****************************************************************************/ 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_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 @@ 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 @@ 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 @@ ****************************************************************************/ 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_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 @@ 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));
