X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=blobdiff_plain;f=source3%2Flibsmb%2Fsmb_share_modes.c;h=37d599a1704bc52c932481fa74de56c3f55af1e3;hp=d42ebc61400e6abbe01654a60d3b713f83a8c648;hb=5c1f8adc331a33c8fdd8e3995284d5833dc29f38;hpb=dffe228283ba756d4370753a1e2aed3cee3acccd;ds=sidebyside

diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index d42ebc61400..37d599a1704 100644
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -59,7 +59,7 @@ struct locking_data {
 			int num_share_mode_entries;
 			struct timespec old_write_time;
 			struct timespec changed_write_time;
-			uint32 num_delete_token_entries;
+			uint32_t num_delete_token_entries;
 		} s;
 		struct share_mode_entry dummy; /* Needed for alignment. */
 	} u;
@@ -144,7 +144,7 @@ static TDB_DATA get_locking_key(struct locking_key *lk, uint64_t dev,
 	lk->dev = (SMB_DEV_T)dev;
 	lk->inode = (SMB_INO_T)ino;
 	lk->extid = extid;
-	ld.dptr = (uint8 *)lk;
+	ld.dptr = (uint8_t *)lk;
 	ld.dsize = sizeof(*lk);
 	return ld;
 }
@@ -211,7 +211,7 @@ static void create_share_mode_entry(struct share_mode_entry *out,
 	out->id.devid = in->dev;
 	out->id.inode = in->ino;
 	out->id.extid = in->extid;
-	out->uid = (uint32)geteuid();
+	out->uid = (uint32_t)geteuid();
 	out->flags = 0;
 	out->name_hash = name_hash;
 }
@@ -343,7 +343,7 @@ int smb_create_share_mode_entry_ex(struct smbdb_ctx *db_ctx,
 	int orig_num_share_modes = 0;
 	struct locking_data *ld = NULL; /* internal samba db state. */
 	struct share_mode_entry *shares = NULL;
-	uint8 *new_data_p = NULL;
+	uint8_t *new_data_p = NULL;
 	size_t new_data_size = 0;
 	int err = 0;
 	uint32_t name_hash = smb_name_hash(sharepath, filename, &err);
@@ -355,7 +355,7 @@ int smb_create_share_mode_entry_ex(struct smbdb_ctx *db_ctx,
 	db_data = tdb_fetch(db_ctx->smb_tdb, locking_key);
 	if (!db_data.dptr) {
 		/* We must create the entry. */
-		db_data.dptr = (uint8 *)malloc(
+		db_data.dptr = (uint8_t *)malloc(
 			sizeof(struct locking_data) +
 			sizeof(struct share_mode_entry) +
 			strlen(sharepath) + 1 +
@@ -390,7 +390,7 @@ int smb_create_share_mode_entry_ex(struct smbdb_ctx *db_ctx,
 	}
 
 	/* Entry exists, we must add a new entry. */
-	new_data_p = (uint8 *)malloc(
+	new_data_p = (uint8_t *)malloc(
 		db_data.dsize + sizeof(struct share_mode_entry));
 	if (!new_data_p) {
 		free(db_data.dptr);
@@ -464,10 +464,10 @@ int smb_delete_share_mode_entry(struct smbdb_ctx *db_ctx,
 	int orig_num_share_modes = 0;
 	struct locking_data *ld = NULL; /* internal samba db state. */
 	struct share_mode_entry *shares = NULL;
-	uint8 *new_data_p = NULL;
+	uint8_t *new_data_p = NULL;
 	size_t remaining_size = 0;
 	size_t i, num_share_modes;
-	const uint8 *remaining_ptr = NULL;
+	const uint8_t *remaining_ptr = NULL;
 
 	db_data = tdb_fetch(db_ctx->smb_tdb, locking_key);
 	if (!db_data.dptr) {
@@ -491,7 +491,7 @@ int smb_delete_share_mode_entry(struct smbdb_ctx *db_ctx,
 	}
 
 	/* More than one - allocate a new record minus the one we'll delete. */
-	new_data_p = (uint8 *)malloc(
+	new_data_p = (uint8_t *)malloc(
 		db_data.dsize - sizeof(struct share_mode_entry));
 	if (!new_data_p) {
 		free(db_data.dptr);