diff options
| -rw-r--r-- | source/locking/brlock.c | 2 | ||||
| -rw-r--r-- | source/printing/nt_printing.c | 2 | ||||
| -rw-r--r-- | source/rpc_server/srv_pipe.c | 2 | ||||
| -rw-r--r-- | source/rpc_server/srv_samr.c | 4 | ||||
| -rw-r--r-- | source/rpc_server/srv_spoolss_nt.c | 2 | ||||
| -rw-r--r-- | source/rpcclient/display_spool.c | 4 |
6 files changed, 7 insertions, 9 deletions
diff --git a/source/locking/brlock.c b/source/locking/brlock.c index 7e22b8ac7aa..979910970fe 100644 --- a/source/locking/brlock.c +++ b/source/locking/brlock.c @@ -440,5 +440,5 @@ static int traverse_fn(TDB_CONTEXT *ttdb, TDB_DATA kbuf, TDB_DATA dbuf, void *st int brl_forall(BRLOCK_FN(fn)) { if (!tdb) return 0; - return tdb_traverse(tdb, traverse_fn, (BRLOCK_FN_CAST())fn); + return tdb_traverse(tdb, traverse_fn, (void *)fn); } diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c index a0aac12c847..a1c3b4f2fe2 100644 --- a/source/printing/nt_printing.c +++ b/source/printing/nt_printing.c @@ -654,14 +654,12 @@ uint32 clean_up_driver_struct(NT_PRINTER_DRIVER_INFO_LEVEL driver_abstract, NT_PRINTER_DRIVER_INFO_LEVEL_3 *driver; driver=driver_abstract.info_3; return clean_up_driver_struct_level_3(driver, user); - break; } case 6: { NT_PRINTER_DRIVER_INFO_LEVEL_6 *driver; driver=driver_abstract.info_6; return clean_up_driver_struct_level_6(driver, user); - break; } default: return ERROR_INVALID_PARAMETER; diff --git a/source/rpc_server/srv_pipe.c b/source/rpc_server/srv_pipe.c index 4cb57c69d8e..4b0c5e93eab 100644 --- a/source/rpc_server/srv_pipe.c +++ b/source/rpc_server/srv_pipe.c @@ -1219,7 +1219,7 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, DEBUG(10, ("api_rpcTNP: rpc input buffer underflow (parse error?)\n")); if (data) { - prs_uint8s(False, "", &p->in_data.data, 0, data, + prs_uint8s(False, "", &p->in_data.data, 0, (unsigned char *)data, data_len); free(data); } diff --git a/source/rpc_server/srv_samr.c b/source/rpc_server/srv_samr.c index 72a86c8d80c..6ebd5b9a8a6 100644 --- a/source/rpc_server/srv_samr.c +++ b/source/rpc_server/srv_samr.c @@ -2337,7 +2337,7 @@ static BOOL set_user_info_23(SAM_USER_INFO_23 *id23, uint32 rid) copy_sam_passwd(&new_pwd, pwd); copy_id23_to_sam_passwd(&new_pwd, id23); - if (!decode_pw_buffer((const char *)id23->pass, buf, 256, &len)) + if (!decode_pw_buffer((char *)id23->pass, buf, 256, &len)) return False; nt_lm_owf_gen(buf, nt_hash, lm_hash); @@ -2378,7 +2378,7 @@ static BOOL set_user_info_24(const SAM_USER_INFO_24 *id24, uint32 rid) memset(buf, 0, sizeof(buf)); - if (!decode_pw_buffer((const char *)id24->pass, buf, 256, &len)) + if (!decode_pw_buffer((char *)id24->pass, buf, 256, &len)) return False; DEBUG(0,("set_user_info_24:nt_lm_owf_gen\n")); diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c index a04c85368f7..05d9f525d4e 100644 --- a/source/rpc_server/srv_spoolss_nt.c +++ b/source/rpc_server/srv_spoolss_nt.c @@ -5174,7 +5174,7 @@ uint32 _spoolss_setprinterdata( POLICY_HND *handle, ZERO_STRUCT(old_param); if (get_specific_param(*printer, 2, param->value, &old_param.data, - &old_param.type, &old_param.data_len)) { + &old_param.type, (unsigned int *)&old_param.data_len)) { if (param->type == old_param.type && param->data_len == old_param.data_len && diff --git a/source/rpcclient/display_spool.c b/source/rpcclient/display_spool.c index 54162a99b73..3a42a374802 100644 --- a/source/rpcclient/display_spool.c +++ b/source/rpcclient/display_spool.c @@ -664,13 +664,13 @@ void display_job_info_ctr(FILE *out_hnd, enum action_type action, case 1: { display_job_info_1_ctr(out_hnd, action, - count, (JOB_INFO_1*const*const)ctr); + count, (JOB_INFO_1 **)ctr); break; } case 2: { display_job_info_2_ctr(out_hnd, action, - count, (JOB_INFO_2*const*const)ctr); + count, (JOB_INFO_2 **)ctr); break; } default: |