Convert all uint32/16/8 to _t in source3/locking.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 0738464163ae0f0e0ff1a1936ae7dda44f4067ce..05e7ee29b143dc77f71c5281b33dac3f1ca9d32d 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1976,7 +1976,7 @@ struct byte_range_lock *brl_get_locks(TALLOC_CTX *mem_ctx, files_struct *fsp)
 
        br_lck->fsp = fsp;
 
-       key.dptr = (uint8 *)&fsp->file_id;
+       key.dptr = (uint8_t *)&fsp->file_id;
        key.dsize = sizeof(struct file_id);
 
        br_lck->record = dbwrap_fetch_locked(brlock_db, br_lck, key);
@@ -2115,7 +2115,7 @@ struct byte_range_lock *brl_get_locks_readonly(files_struct *fsp)
 
 struct brl_revalidate_state {
        ssize_t array_size;
-       uint32 num_pids;
+       uint32_t num_pids;
        struct server_id *pids;
 };
 
@@ -2171,7 +2171,7 @@ void brl_revalidate(struct messaging_context *msg_ctx,
                    DATA_BLOB *data)
 {
        struct brl_revalidate_state *state;
-       uint32 i;
+       uint32_t i;
        struct server_id last_pid;
 
        if (!(state = talloc_zero(NULL, struct brl_revalidate_state))) {

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 67eff8f0ee0c730000c6fad57c860d9d7a6c6cab..9dce85a1a541f992749aebdca60620a96fa1aea1 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -567,7 +567,7 @@ bool rename_share_filename(struct messaging_context *msg_ctx,
                        has_stream ? d->stream_name : ""));
 
                messaging_send_buf(msg_ctx, se->pid, MSG_SMB_FILE_RENAME,
-                                  (uint8 *)frm, msg_len);
+                                  (uint8_t *)frm, msg_len);
        }
 
        for (i=0; i<d->num_leases; i++) {
@@ -846,7 +846,7 @@ bool set_share_mode(struct share_mode_lock *lck, struct files_struct *fsp,
        e->time.tv_usec = fsp->open_time.tv_usec;
        e->id = fsp->file_id;
        e->share_file_id = fsp->fh->gen_id;
-       e->uid = (uint32)uid;
+       e->uid = (uint32_t)uid;
        e->flags = fsp->posix_open ? SHARE_MODE_FLAG_POSIX_OPEN : 0;
        e->name_hash = fsp->name_hash;
 

diff --git a/source3/locking/posix.c b/source3/locking/posix.c
index a0966ab6cd1a8fd66038f4860c4c92a1221b9b23..ea42159de4843b65bfe0b21ea55a15b504396032 100644 (file)
--- a/source3/locking/posix.c
+++ b/source3/locking/posix.c
@@ -361,7 +361,7 @@ static TDB_DATA locking_ref_count_key_fsp(files_struct *fsp,
 
 static TDB_DATA fd_array_key_fsp(files_struct *fsp)
 {
-       return make_tdb_data((uint8 *)&fsp->file_id, sizeof(fsp->file_id));
+       return make_tdb_data((uint8_t *)&fsp->file_id, sizeof(fsp->file_id));
 }
 
 /*******************************************************************