diff options
26 files changed, 63 insertions, 63 deletions
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py index b4427d36884..04699927624 100644 --- a/buildtools/wafsamba/samba_patterns.py +++ b/buildtools/wafsamba/samba_patterns.py @@ -140,9 +140,9 @@ def write_build_options_footer(fp): fp.write(" output(screen, \" sizeof(int): %lu\\n\",(unsigned long)sizeof(int));\n") fp.write(" output(screen, \" sizeof(long): %lu\\n\",(unsigned long)sizeof(long));\n") fp.write(" output(screen, \" sizeof(long long): %lu\\n\",(unsigned long)sizeof(long long));\n") - fp.write(" output(screen, \" sizeof(uint8): %lu\\n\",(unsigned long)sizeof(uint8));\n") - fp.write(" output(screen, \" sizeof(uint16): %lu\\n\",(unsigned long)sizeof(uint16));\n") - fp.write(" output(screen, \" sizeof(uint32): %lu\\n\",(unsigned long)sizeof(uint32));\n") + fp.write(" output(screen, \" sizeof(uint8_t): %lu\\n\",(unsigned long)sizeof(uint8_t));\n") + fp.write(" output(screen, \" sizeof(uint16_t): %lu\\n\",(unsigned long)sizeof(uint16_t));\n") + fp.write(" output(screen, \" sizeof(uint32_t): %lu\\n\",(unsigned long)sizeof(uint32_t));\n") fp.write(" output(screen, \" sizeof(short): %lu\\n\",(unsigned long)sizeof(short));\n") fp.write(" output(screen, \" sizeof(void*): %lu\\n\",(unsigned long)sizeof(void*));\n") fp.write(" output(screen, \" sizeof(size_t): %lu\\n\",(unsigned long)sizeof(size_t));\n") diff --git a/examples/VFS/shadow_copy_test.c b/examples/VFS/shadow_copy_test.c index 944136badd4..b3a99ca1612 100644 --- a/examples/VFS/shadow_copy_test.c +++ b/examples/VFS/shadow_copy_test.c @@ -56,8 +56,8 @@ static int test_get_shadow_copy_data(vfs_handle_struct *handle, struct shadow_copy_data *shadow_copy_data, bool labels) { - uint32 num = 3; - uint32 i; + uint32_t num = 3; + uint32_t i; shadow_copy_data->num_volumes = num; diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c index a9cbabf8057..296a85501d5 100644 --- a/examples/VFS/skel_opaque.c +++ b/examples/VFS/skel_opaque.c @@ -97,7 +97,7 @@ static NTSTATUS skel_get_dfs_referrals(struct vfs_handle_struct *handle, } static DIR *skel_opendir(vfs_handle_struct *handle, const char *fname, - const char *mask, uint32 attr) + const char *mask, uint32_t attr) { return NULL; } @@ -130,7 +130,7 @@ static NTSTATUS skel_snap_delete(struct vfs_handle_struct *handle, } static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, - const char *mask, uint32 attr) + const char *mask, uint32_t attr) { return NULL; } @@ -435,7 +435,7 @@ static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, static int skel_kernel_flock(struct vfs_handle_struct *handle, struct files_struct *fsp, - uint32 share_mode, uint32 access_mask) + uint32_t share_mode, uint32_t access_mask) { errno = ENOSYS; return -1; @@ -671,7 +671,7 @@ static NTSTATUS skel_readdir_attr(struct vfs_handle_struct *handle, } static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, - uint32 security_info, + uint32_t security_info, TALLOC_CTX *mem_ctx, struct security_descriptor **ppdesc) { @@ -679,7 +679,7 @@ static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, } static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle, - const char *name, uint32 security_info, + const char *name, uint32_t security_info, TALLOC_CTX *mem_ctx, struct security_descriptor **ppdesc) { @@ -687,7 +687,7 @@ static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle, } static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, - uint32 security_info_sent, + uint32_t security_info_sent, const struct security_descriptor *psd) { return NT_STATUS_NOT_IMPLEMENTED; diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c index 651eb2f840d..10f5ac5570f 100644 --- a/examples/VFS/skel_transparent.c +++ b/examples/VFS/skel_transparent.c @@ -95,7 +95,7 @@ static NTSTATUS skel_get_dfs_referrals(struct vfs_handle_struct *handle, } static DIR *skel_opendir(vfs_handle_struct *handle, const char *fname, - const char *mask, uint32 attr) + const char *mask, uint32_t attr) { return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr); } @@ -130,7 +130,7 @@ static NTSTATUS skel_snap_delete(struct vfs_handle_struct *handle, } static DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, - const char *mask, uint32 attr) + const char *mask, uint32_t attr) { return SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr); } @@ -531,8 +531,8 @@ static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, } static int skel_kernel_flock(struct vfs_handle_struct *handle, - struct files_struct *fsp, uint32 share_mode, - uint32 access_mask) + struct files_struct *fsp, uint32_t share_mode, + uint32_t access_mask) { return SMB_VFS_NEXT_KERNEL_FLOCK(handle, fsp, share_mode, access_mask); } @@ -799,7 +799,7 @@ static NTSTATUS skel_readdir_attr(struct vfs_handle_struct *handle, } static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, - uint32 security_info, + uint32_t security_info, TALLOC_CTX *mem_ctx, struct security_descriptor **ppdesc) { @@ -808,7 +808,7 @@ static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, } static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle, - const char *name, uint32 security_info, + const char *name, uint32_t security_info, TALLOC_CTX *mem_ctx, struct security_descriptor **ppdesc) { @@ -817,7 +817,7 @@ static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle, } static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp, - uint32 security_info_sent, + uint32_t security_info_sent, const struct security_descriptor *psd) { return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd); diff --git a/lib/util/debug_s3.c b/lib/util/debug_s3.c index d9ac15f6605..98e7b007230 100644 --- a/lib/util/debug_s3.c +++ b/lib/util/debug_s3.c @@ -94,7 +94,7 @@ static void debuglevel_message(struct messaging_context *msg_ctx, DEBUG(1, ("INFO: Received REQ_DEBUGLEVEL message from PID %s\n", server_id_str_buf(src, &tmp))); messaging_send_buf(msg_ctx, src, MSG_DEBUGLEVEL, - (uint8 *)message, strlen(message) + 1); + (uint8_t *)message, strlen(message) + 1); TALLOC_FREE(message); } diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c index 1f95be60a54..c7319adceae 100644 --- a/source3/auth/token_util.c +++ b/source3/auth/token_util.c @@ -47,7 +47,7 @@ bool nt_token_check_sid ( const struct dom_sid *sid, const struct security_token return security_token_has_sid(token, sid); } -bool nt_token_check_domain_rid( struct security_token *token, uint32 rid ) +bool nt_token_check_domain_rid( struct security_token *token, uint32_t rid ) { struct dom_sid domain_sid; @@ -129,7 +129,7 @@ struct security_token *get_root_nt_token( void ) NTSTATUS add_aliases(const struct dom_sid *domain_sid, struct security_token *token) { - uint32 *aliases; + uint32_t *aliases; size_t i, num_aliases; NTSTATUS status; TALLOC_CTX *tmp_ctx; diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h index 65fad99892b..c9c83eb3c45 100644 --- a/source3/include/libsmb_internal.h +++ b/source3/include/libsmb_internal.h @@ -373,7 +373,7 @@ bool SMBC_getatr(SMBCCTX * context, SMBCSRV *srv, const char *path, - uint16 *mode, + uint16_t *mode, off_t *size, struct timespec *create_time_ts, struct timespec *access_time_ts, @@ -387,7 +387,7 @@ SMBC_setatr(SMBCCTX * context, SMBCSRV *srv, char *path, time_t access_time, time_t write_time, time_t change_time, - uint16 mode); + uint16_t mode); off_t SMBC_lseek_ctx(SMBCCTX *context, diff --git a/source3/include/proto.h b/source3/include/proto.h index dad4dd9dac9..0858289ad9f 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -365,7 +365,7 @@ bool check_same_stat(const SMB_STRUCT_STAT *sbuf1, const SMB_STRUCT_STAT *sbuf2); void show_msg(const char *buf); int set_message_bcc(char *buf,int num_bytes); -ssize_t message_push_blob(uint8 **outbuf, DATA_BLOB blob); +ssize_t message_push_blob(uint8_t **outbuf, DATA_BLOB blob); char *unix_clean_name(TALLOC_CTX *ctx, const char *s); char *clean_name(TALLOC_CTX *ctx, const char *s); ssize_t write_data_at_offset(int fd, const char *buffer, size_t N, off_t pos); @@ -741,7 +741,7 @@ bool spnego_parse_negTokenInit(TALLOC_CTX *ctx, char *OIDs[ASN1_MAX_OIDS], char **principal, DATA_BLOB *secblob); -DATA_BLOB spnego_gen_krb5_wrap(TALLOC_CTX *ctx, const DATA_BLOB ticket, const uint8 tok_id[2]); +DATA_BLOB spnego_gen_krb5_wrap(TALLOC_CTX *ctx, const DATA_BLOB ticket, const uint8_t tok_id[2]); int spnego_gen_krb5_negTokenInit(TALLOC_CTX *ctx, const char *principal, int time_offset, DATA_BLOB *targ, @@ -776,7 +776,7 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx, /* The following definitions come from libsmb/errormap.c */ -NTSTATUS dos_to_ntstatus(uint8 eclass, uint32_t ecode); +NTSTATUS dos_to_ntstatus(uint8_t eclass, uint32_t ecode); /* The following definitions come from libsmb/namecache.c */ @@ -938,9 +938,9 @@ bool netsamlogon_cache_have(const struct dom_sid *user_sid); /* The following definitions come from libsmb/smberr.c */ -const char *smb_dos_err_name(uint8 e_class, uint16 num); +const char *smb_dos_err_name(uint8_t e_class, uint16_t num); const char *get_dos_error_msg(WERROR result); -const char *smb_dos_err_class(uint8 e_class); +const char *smb_dos_err_class(uint8_t e_class); WERROR map_werror_from_unix(int error); /* The following definitions come from libsmb/trustdom_cache.c */ diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h index a33406a9177..06d4b49fcc9 100644 --- a/source3/include/rpc_misc.h +++ b/source3/include/rpc_misc.h @@ -28,7 +28,7 @@ **********************************************************************/ #define OUR_HANDLE(hnd) (((hnd)==NULL) ? "NULL" :\ - ( IVAL((hnd)->uuid.node,2) == (uint32)getpid() ? "OURS" : \ + ( IVAL((hnd)->uuid.node,2) == (uint32_t)getpid() ? "OURS" : \ "OTHER")), ((unsigned int)IVAL((hnd)->uuid.node,2)),\ ((unsigned int)getpid() ) diff --git a/source3/include/smb.h b/source3/include/smb.h index 7026cb4defa..751b0e6bf00 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -757,7 +757,7 @@ struct ip_service { }; struct ea_struct { - uint8 flags; + uint8_t flags; char *name; DATA_BLOB value; }; diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h index 80a8cac2ba9..11160335975 100644 --- a/source3/include/util_tdb.h +++ b/source3/include/util_tdb.h @@ -36,9 +36,9 @@ int tdb_trans_delete(struct tdb_context *tdb, TDB_DATA key); * The tdb_unpack() and tdb_pack[_append]() helpers are deprecated. Consider * using idl/ndr for marshalling of complex data types instead. */ -int tdb_unpack(const uint8 *buf, int bufsize, const char *fmt, ...); -size_t tdb_pack(uint8 *buf, int bufsize, const char *fmt, ...); -bool tdb_pack_append(TALLOC_CTX *mem_ctx, uint8 **buf, size_t *len, +int tdb_unpack(const uint8_t *buf, int bufsize, const char *fmt, ...); +size_t tdb_pack(uint8_t *buf, int bufsize, const char *fmt, ...); +bool tdb_pack_append(TALLOC_CTX *mem_ctx, uint8_t **buf, size_t *len, const char *fmt, ...); struct tdb_context *tdb_open_log(const char *name, int hash_size, diff --git a/source3/lib/smbconf/smbconf_reg.c b/source3/lib/smbconf/smbconf_reg.c index e756580ceeb..78f40824ae6 100644 --- a/source3/lib/smbconf/smbconf_reg.c +++ b/source3/lib/smbconf/smbconf_reg.c @@ -93,7 +93,7 @@ bool smbconf_reg_parameter_is_valid(const char *param_name) static sbcErr smbconf_reg_open_service_key(TALLOC_CTX *mem_ctx, struct smbconf_ctx *ctx, const char *servicename, - uint32 desired_access, + uint32_t desired_access, struct registry_key **key) { WERROR werr; @@ -338,7 +338,7 @@ static char *smbconf_format_registry_value(TALLOC_CTX *mem_ctx, break; } case REG_MULTI_SZ: { - uint32 j; + uint32_t j; const char **a = NULL; if (!pull_reg_multi_sz(mem_ctx, &value->data, &a)) { break; diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index 2ad9bfdee1e..1c0375d2aa8 100644 --- a/source3/libads/ldap.c +++ b/source3/libads/ldap.c @@ -1788,7 +1788,7 @@ ADS_STATUS ads_add_strlist(TALLOC_CTX *ctx, ADS_MODLIST *mods, uint32_t ads_get_kvno(ADS_STRUCT *ads, const char *account_name) { LDAPMessage *res = NULL; - uint32_t kvno = (uint32)-1; /* -1 indicates a failure */ + uint32_t kvno = (uint32_t)-1; /* -1 indicates a failure */ char *filter; const char *attrs[] = {"msDS-KeyVersionNumber", NULL}; char *dn_string = NULL; diff --git a/source3/libads/sasl_wrapping.c b/source3/libads/sasl_wrapping.c index 9296d60ba9d..c7a58ab6147 100644 --- a/source3/libads/sasl_wrapping.c +++ b/source3/libads/sasl_wrapping.c @@ -45,7 +45,7 @@ static ber_slen_t ads_saslwrap_prepare_inbuf(ADS_STRUCT *ads) ads->ldap.in.left = 0; ads->ldap.in.size = 4 + ads->ldap.in.min_wrapped; ads->ldap.in.buf = talloc_array(ads->ldap.mem_ctx, - uint8, ads->ldap.in.size); + uint8_t, ads->ldap.in.size); if (!ads->ldap.in.buf) { return -1; } @@ -62,7 +62,7 @@ static ber_slen_t ads_saslwrap_grow_inbuf(ADS_STRUCT *ads) ads->ldap.in.size = 4 + ads->ldap.in.needed; ads->ldap.in.buf = talloc_realloc(ads->ldap.mem_ctx, ads->ldap.in.buf, - uint8, ads->ldap.in.size); + uint8_t, ads->ldap.in.size); if (!ads->ldap.in.buf) { return -1; } @@ -177,7 +177,7 @@ static ber_slen_t ads_saslwrap_prepare_outbuf(ADS_STRUCT *ads, uint32_t len) ads->ldap.out.left = 0; ads->ldap.out.size = 4 + ads->ldap.out.sig_size + len; ads->ldap.out.buf = talloc_array(ads->ldap.mem_ctx, - uint8, ads->ldap.out.size); + uint8_t, ads->ldap.out.size); if (!ads->ldap.out.buf) { return -1; } @@ -214,7 +214,7 @@ static ber_slen_t ads_saslwrap_write(Sockbuf_IO_Desc *sbiod, void *buf, ber_len_ ret = ads_saslwrap_prepare_outbuf(ads, rlen); if (ret < 0) return ret; - status = ads->ldap.wrap_ops->wrap(ads, (uint8 *)buf, rlen); + status = ads->ldap.wrap_ops->wrap(ads, (uint8_t *)buf, rlen); if (!ADS_ERR_OK(status)) { errno = EACCES; return -1; diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 166918efc43..86ce53d1b59 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.c @@ -318,7 +318,7 @@ uint16_t cli_state_get_vc_num(struct cli_state *cli) Set the PID to use for smb messages. Return the old pid. ****************************************************************************/ -uint16_t cli_setpid(struct cli_state *cli, uint16 pid) +uint16_t cli_setpid(struct cli_state *cli, uint16_t pid) { uint16_t ret = cli->smb1.pid; cli->smb1.pid = pid; diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c index 3fbfbbe67a6..d4e4451a883 100644 --- a/source3/libsmb/clifsinfo.c +++ b/source3/libsmb/clifsinfo.c @@ -235,8 +235,8 @@ NTSTATUS cli_set_unix_extensions_capabilities_recv(struct tevent_req *req) } NTSTATUS cli_set_unix_extensions_capabilities(struct cli_state *cli, - uint16_t major, uint16 minor, - uint32_t caplow, uint32 caphigh) + uint16_t major, uint16_t minor, + uint32_t caplow, uint32_t caphigh) { struct tevent_context *ev; struct tevent_req *req; diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h index a837bef1a41..4bbdd44ca89 100644 --- a/source3/libsmb/proto.h +++ b/source3/libsmb/proto.h @@ -637,7 +637,7 @@ struct tevent_req *cli_set_unix_extensions_capabilities_send( NTSTATUS cli_set_unix_extensions_capabilities_recv(struct tevent_req *req); NTSTATUS cli_set_unix_extensions_capabilities(struct cli_state *cli, uint16_t major, uint16_t minor, - uint32_t caplow, uint32 caphigh); + uint32_t caplow, uint32_t caphigh); struct tevent_req *cli_get_fs_attr_info_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct cli_state *cli); diff --git a/source3/printing/notify.h b/source3/printing/notify.h index f64fab6243a..427bbf0c775 100644 --- a/source3/printing/notify.h +++ b/source3/printing/notify.h @@ -40,7 +40,7 @@ void notify_job_status_byname(struct tevent_context *ev, uint32_t flags); void notify_job_status(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32_t jobid, uint32 status); + const char *sharename, uint32_t jobid, uint32_t status); void notify_job_total_bytes(struct tevent_context *ev, struct messaging_context *msg_ctx, const char *sharename, uint32_t jobid, diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 5b920518b56..3d6cfb13309 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1900,7 +1900,7 @@ bool print_time_access_check(const struct auth_session_info *session_info, } t = gmtime(&now); - mins = (uint32_t)t->tm_hour*60 + (uint32)t->tm_min; + mins = (uint32_t)t->tm_hour*60 + (uint32_t)t->tm_min; if (mins >= pinfo2->starttime && mins <= pinfo2->untiltime) { ok = True; diff --git a/source3/profile/profile.c b/source3/profile/profile.c index 67b1fc765b9..00cb3e550c4 100644 --- a/source3/profile/profile.c +++ b/source3/profile/profile.c @@ -113,7 +113,7 @@ static void reqprofile_message(struct messaging_context *msg_ctx, DEBUG(1,("INFO: Received REQ_PROFILELEVEL message from PID %u\n", (unsigned int)procid_to_pid(&src))); messaging_send_buf(msg_ctx, src, MSG_PROFILELEVEL, - (uint8 *)&level, sizeof(level)); + (uint8_t *)&level, sizeof(level)); } /******************************************************************* diff --git a/source3/registry/reg_parse_prs.c b/source3/registry/reg_parse_prs.c index 57038dfa61b..834ba188669 100644 --- a/source3/registry/reg_parse_prs.c +++ b/source3/registry/reg_parse_prs.c @@ -333,7 +333,7 @@ void prs_switch_type(prs_struct *ps, bool io) Stream a uint16. ********************************************************************/ -bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16 *data16) +bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16_t *data16) { char *q = prs_mem_get(ps, sizeof(uint16_t)); if (q == NULL) diff --git a/source3/registry/reg_parse_prs.h b/source3/registry/reg_parse_prs.h index 9793fd39687..1bbbabd31a2 100644 --- a/source3/registry/reg_parse_prs.h +++ b/source3/registry/reg_parse_prs.h @@ -72,7 +72,7 @@ bool prs_align(prs_struct *ps); bool prs_align_uint64(prs_struct *ps); char *prs_mem_get(prs_struct *ps, uint32_t extra_size); void prs_switch_type(prs_struct *ps, bool io); -bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16 *data16); +bool prs_uint16(const char *name, prs_struct *ps, int depth, uint16_t *data16); bool prs_uint32(const char *name, prs_struct *ps, int depth, uint32_t *data32); bool prs_uint64(const char *name, prs_struct *ps, int depth, uint64 *data64); bool prs_uint8s(bool charmode, const char *name, prs_struct *ps, int depth, uint8_t *data8s, int len); diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c index 1493b6c94ab..5de2901946c 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -246,7 +246,7 @@ static bool prs_regf_block( const char *desc, prs_struct *ps, int depth, REGF_FI prs_debug(ps, depth, desc, "prs_regf_block"); depth++; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)file->header, sizeof( file->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t *)file->header, sizeof( file->header )) ) return False; /* yes, these values are always identical so store them only once */ @@ -308,7 +308,7 @@ static bool prs_hbin_block( const char *desc, prs_struct *ps, int depth, REGF_HB prs_debug(ps, depth, desc, "prs_regf_block"); depth++; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)hbin->header, sizeof( hbin->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t*)hbin->header, sizeof( hbin->header )) ) return False; if ( !prs_uint32( "first_hbin_off", ps, depth, &hbin->first_hbin_off )) @@ -357,7 +357,7 @@ static bool prs_nk_rec( const char *desc, prs_struct *ps, int depth, REGF_NK_REC if ( !prs_uint32( "rec_size", ps, depth, &nk->rec_size )) return False; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)nk->header, sizeof( nk->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t *)nk->header, sizeof( nk->header )) ) return False; if ( !prs_uint16( "key_type", ps, depth, &nk->key_type )) @@ -418,7 +418,7 @@ static bool prs_nk_rec( const char *desc, prs_struct *ps, int depth, REGF_NK_REC return False; } - if ( !prs_uint8s( True, "name", ps, depth, (uint8*)nk->keyname, name_length) ) + if ( !prs_uint8s( True, "name", ps, depth, (uint8_t *)nk->keyname, name_length) ) return False; if ( UNMARSHALLING(ps) ) @@ -682,7 +682,7 @@ static bool hbin_prs_lf_records( const char *desc, REGF_HBIN *hbin, int depth, R if ( !prs_uint32( "rec_size", &hbin->ps, depth, &lf->rec_size )) return False; - if ( !prs_uint8s( True, "header", &hbin->ps, depth, (uint8*)lf->header, sizeof( lf->header )) ) + if ( !prs_uint8s( True, "header", &hbin->ps, depth, (uint8_t *)lf->header, sizeof( lf->header )) ) return False; if ( !prs_uint16( "num_keys", &hbin->ps, depth, &lf->num_keys)) @@ -740,7 +740,7 @@ static bool hbin_prs_sk_rec( const char *desc, REGF_HBIN *hbin, int depth, REGF_ if ( !prs_uint32( "rec_size", &hbin->ps, depth, &sk->rec_size )) return False; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)sk->header, sizeof( sk->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t *)sk->header, sizeof( sk->header )) ) return False; if ( !prs_uint16( "tag", ps, depth, &tag)) return False; @@ -816,7 +816,7 @@ static bool hbin_prs_vk_rec( const char *desc, REGF_HBIN *hbin, int depth, REGF_ if ( !prs_uint32( "rec_size", &hbin->ps, depth, &vk->rec_size )) return False; - if ( !prs_uint8s( True, "header", ps, depth, (uint8*)vk->header, sizeof( vk->header )) ) + if ( !prs_uint8s( True, "header", ps, depth, (uint8_t *)vk->header, sizeof( vk->header )) ) return False; if ( MARSHALLING(&hbin->ps) ) @@ -845,7 +845,7 @@ static bool hbin_prs_vk_rec( const char *desc, REGF_HBIN *hbin, int depth, REGF_ if ( !(vk->valuename = PRS_ALLOC_MEM( ps, char, name_length+1 ))) return False; } - if ( !prs_uint8s( True, "name", ps, depth, (uint8*)vk->valuename, name_length ) ) + if ( !prs_uint8s( True, "name", ps, depth, (uint8_t *)vk->valuename, name_length ) ) return False; } diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c index d45ac31d4ad..b8c81de5bf1 100644 --- a/source3/utils/net_groupmap.c +++ b/source3/utils/net_groupmap.c @@ -654,7 +654,7 @@ static int net_groupmap_set(struct net_context *c, int argc, const char **argv) if (c->opt_rid == 0) { if ( pdb_capabilities() & PDB_CAP_STORE_RIDS ) { - if ( !pdb_new_rid((uint32*)&c->opt_rid) ) { + if ( !pdb_new_rid((uint32_t *)&c->opt_rid) ) { d_fprintf( stderr, _("Could not allocate new RID\n")); TALLOC_FREE(map); diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c index 4be7b5f74b8..96703e438ca 100644 --- a/source3/utils/net_rap.c +++ b/source3/utils/net_rap.c @@ -350,7 +350,7 @@ int net_rap_session_usage(struct net_context *c, int argc, const char **argv) static void list_sessions_func(char *wsname, char *username, uint16_t conns, uint16_t opens, uint16_t users, uint32_t sess_time, - uint32_t idle_time, uint32 user_flags, char *clitype) + uint32_t idle_time, uint32_t user_flags, char *clitype) { int hrs = idle_time / 3600; int min = (idle_time / 60) % 60; @@ -361,8 +361,8 @@ static void list_sessions_func(char *wsname, char *username, uint16_t conns, } static void display_session_func(const char *wsname, const char *username, - uint16_t conns, uint16_t opens, uint16 users, - uint32_t sess_time, uint32 idle_time, + uint16_t conns, uint16_t opens, uint16_t users, + uint32_t sess_time, uint32_t idle_time, uint32_t user_flags, const char *clitype) { int ihrs = idle_time / 3600; @@ -382,7 +382,7 @@ static void display_session_func(const char *wsname, const char *username, shrs, smin, ssec, ihrs, imin, isec); } -static void display_conns_func(uint16_t conn_id, uint16_t conn_type, uint16 opens, +static void display_conns_func(uint16_t conn_id, uint16_t conn_type, uint16_t opens, uint16_t users, uint32_t conn_time, const char *username, const char *netname) { diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index fedbbe736a3..5ad69e244fc 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -105,7 +105,7 @@ NTSTATUS wcache_query_user_fullname(struct winbindd_domain *domain, NTSTATUS wcache_lookup_useraliases(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, uint32_t num_sids, const struct dom_sid *sids, - uint32_t *pnum_aliases, uint32 **paliases); + uint32_t *pnum_aliases, uint32_t **paliases); NTSTATUS wcache_lookup_usergroups(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, const struct dom_sid *user_sid, |