r3971: fix compiler warnings

metze

diff --git a/source/client/client.c b/source/client/client.c
index f73bacbcbc028225d8ff6df65b271a6c10b189ca..1a357fbbd5a34172f30ff224fba09ac9fe86e26b 100644 (file)
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -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);
 

diff --git a/source/libcli/auth/ntlmssp_parse.c b/source/libcli/auth/ntlmssp_parse.c
index c36bb6a4fc157d5e20213afd8fa924ed0e21fba6..39fe5a87128294ddc94a0f6746932df9bcaa3f72 100644 (file)
--- a/source/libcli/auth/ntlmssp_parse.c
+++ b/source/libcli/auth/ntlmssp_parse.c
@@ -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;

diff --git a/source/libcli/raw/raweas.c b/source/libcli/raw/raweas.c
index 17e5ce8f75ddee086b1fa053cbddc0f0c41dc9d3..621181841f8586be4a855ff5b80450b516b246e1 100644 (file)
--- a/source/libcli/raw/raweas.c
+++ b/source/libcli/raw/raweas.c
@@ -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;

diff --git a/source/libcli/raw/rawtrans.c b/source/libcli/raw/rawtrans.c
index 2554a736f5a5c3d52484dd75a78c05156d4c2648..371f50410dec64b2f18adec4225e15a3a1e28adc 100644 (file)
--- a/source/libcli/raw/rawtrans.c
+++ b/source/libcli/raw/rawtrans.c
@@ -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;

diff --git a/source/ntvfs/print/vfs_print.c b/source/ntvfs/print/vfs_print.c
index 4e2dfad0caad0133f2cc7a795ba551b837fdc14f..c62357c949e6badb911dc3d57584425d3d3bbbad 100644 (file)
--- a/source/ntvfs/print/vfs_print.c
+++ b/source/ntvfs/print/vfs_print.c
@@ -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);

diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index 01ccf493baab611a3b4ee67486100665bf4f07c0..f7b9c02d8dfafb72c45a8b93bf4ae48a9cac522a 100644 (file)
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -56,7 +56,7 @@ void secrets_shutdown(void)
 BOOL secrets_init(void)
 {
        pstring fname;
-       char dummy;
+       uint8_t dummy;
 
        if (tdb)
                return True;

diff --git a/source/smb_server/nttrans.c b/source/smb_server/nttrans.c
index abb66a24ca46840a40ec4e00a9f19bc4e5dd2fbc..0a268ccbf4e97485e3b3b7ee5a53d7caab677405 100644 (file)
--- a/source/smb_server/nttrans.c
+++ b/source/smb_server/nttrans.c
@@ -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 */

diff --git a/source/smb_server/trans2.c b/source/smb_server/trans2.c
index 13fffb44876bba8a63fccb2d99c358a63ad6e0c4..427583954ac0f69573d5613a4c533c5f41936e92 100644 (file)
--- a/source/smb_server/trans2.c
+++ b/source/smb_server/trans2.c
@@ -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 */

diff --git a/source/torture/basic/scanner.c b/source/torture/basic/scanner.c
index da18a50a0f4332cbf2870862ce8384efe1bd51ea..ad4220b9ad96ff03e190f0005a63738dfafaae60 100644 (file)
--- a/source/torture/basic/scanner.c
+++ b/source/torture/basic/scanner.c
@@ -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));