Change the registry subsystem to use uint32_t from uint32. Also change session.h.

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

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Apr 16 00:37:28 CEST 2015 on sn-devel-104

1 files changed, 46 insertions, 46 deletions

diff --git a/source3/registry/regfio.h b/source3/registry/regfio.h
index 3c2b6560bfa..71365c064b1 100644
--- a/source3/registry/regfio.h
+++ b/source3/registry/regfio.h
@@ -64,14 +64,14 @@ struct regsubkey_ctr;
 struct regf_hbin;
 typedef struct regf_hbin {
 	struct regf_hbin *prev, *next;
-	uint32 file_off;		/* my offset in the registry file */
-	uint32 free_off;		/* offset to free space within the hbin record */
-	uint32 free_size;		/* amount of data left in the block */
+	uint32_t file_off;		/* my offset in the registry file */
+	uint32_t free_off;		/* offset to free space within the hbin record */
+	uint32_t free_size;		/* amount of data left in the block */
 	int ref_count;			/* how many active records are pointing to this block (not used currently) */
 	
 	char   header[HBIN_HDR_SIZE];	/* "hbin" */
-	uint32 first_hbin_off;		/* offset from first hbin block */
-	uint32 block_size;		/* block size of this blockually a multiple of 4096Kb) */
+	uint32_t first_hbin_off;		/* offset from first hbin block */
+	uint32_t block_size;		/* block size of this blockually a multiple of 4096Kb) */
 
 	prs_struct ps;			/* data */
 
@@ -81,15 +81,15 @@ typedef struct regf_hbin {
 /* ??? List -- list of key offsets and hashed names for consistency */
 
 typedef struct {
-	uint32 nk_off;
-	uint8 keycheck[sizeof(uint32)];
+	uint32_t nk_off;
+	uint8 keycheck[sizeof(uint32_t)];
 	char *fullname;
 } REGF_HASH_REC;
 
 typedef struct {
 	REGF_HBIN *hbin;	/* pointer to HBIN record (in memory) containing this nk record */
-	uint32 hbin_off;	/* offset from beginning of this hbin block */
-	uint32 rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
+	uint32_t hbin_off;	/* offset from beginning of this hbin block */
+	uint32_t rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
 
 	char header[REC_HDR_SIZE];
 	uint16 num_keys;
@@ -100,16 +100,16 @@ typedef struct {
 
 typedef struct {
 	REGF_HBIN *hbin;	/* pointer to HBIN record (in memory) containing this nk record */
-	uint32 hbin_off;	/* offset from beginning of this hbin block */
-	uint32 rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
-	uint32 rec_off;		/* offset stored in the value list */
+	uint32_t hbin_off;	/* offset from beginning of this hbin block */
+	uint32_t rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
+	uint32_t rec_off;		/* offset stored in the value list */
 	
 	char header[REC_HDR_SIZE];
 	char *valuename;
-	uint32 data_size;
-	uint32 data_off;
+	uint32_t data_size;
+	uint32_t data_off;
 	uint8  *data;
-	uint32 type;
+	uint32_t type;
 	uint16 flag;
 } REGF_VK_REC;
 
@@ -120,17 +120,17 @@ struct _regf_sk_rec;
 typedef struct _regf_sk_rec {
 	struct _regf_sk_rec *next, *prev;
 	REGF_HBIN *hbin;	/* pointer to HBIN record (in memory) containing this nk record */
-	uint32 hbin_off;	/* offset from beginning of this hbin block */
-	uint32 rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
+	uint32_t hbin_off;	/* offset from beginning of this hbin block */
+	uint32_t rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
 
-	uint32 sk_off;		/* offset parsed from NK record used as a key
+	uint32_t sk_off;		/* offset parsed from NK record used as a key
 				   to lookup reference to this SK record */
 
 	char header[REC_HDR_SIZE];
-	uint32 prev_sk_off;
-	uint32 next_sk_off;
-	uint32 ref_count;
-	uint32 size;
+	uint32_t prev_sk_off;
+	uint32_t next_sk_off;
+	uint32_t ref_count;
+	uint32_t size;
 	struct security_descriptor *sec_desc;
 } REGF_SK_REC;
 
@@ -138,38 +138,38 @@ typedef struct _regf_sk_rec {
 
 typedef struct {
 	REGF_HBIN *hbin;	/* pointer to HBIN record (in memory) containing this nk record */
-	uint32 hbin_off;	/* offset from beginning of this hbin block */
-	uint32 subkey_index;	/* index to next subkey record to return */
-	uint32 rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
+	uint32_t hbin_off;	/* offset from beginning of this hbin block */
+	uint32_t subkey_index;	/* index to next subkey record to return */
+	uint32_t rec_size;	/* ((start_offset - end_offset) & 0xfffffff8) */
 	
 	/* header information */
 	
 	char header[REC_HDR_SIZE];
 	uint16 key_type;
 	NTTIME mtime;
-	uint32 parent_off;	/* back pointer in registry hive */
-	uint32 classname_off;	
+	uint32_t parent_off;	/* back pointer in registry hive */
+	uint32_t classname_off;
 	char *classname;
 	char *keyname;
 
 	/* max lengths */
 
-	uint32 max_bytes_subkeyname;		/* max subkey name * 2 */
-	uint32 max_bytes_subkeyclassname;	/* max subkey classname length (as if) */
-	uint32 max_bytes_valuename;		/* max valuename * 2 */
-	uint32 max_bytes_value;			/* max value data size */
+	uint32_t max_bytes_subkeyname;		/* max subkey name * 2 */
+	uint32_t max_bytes_subkeyclassname;	/* max subkey classname length (as if) */
+	uint32_t max_bytes_valuename;		/* max valuename * 2 */
+	uint32_t max_bytes_value;			/* max value data size */
 
 	/* unknowns */
 
-	uint32 unk_index;			/* nigel says run time index ? */
+	uint32_t unk_index;			/* nigel says run time index ? */
 	
 	/* children */
 	
-	uint32 num_subkeys;
-	uint32 subkeys_off;	/* hash records that point to NK records */	
-	uint32 num_values;
-	uint32 values_off;	/* value lists which point to VK records */
-	uint32 sk_off;		/* offset to SK record */
+	uint32_t num_subkeys;
+	uint32_t subkeys_off;	/* hash records that point to NK records */
+	uint32_t num_values;
+	uint32_t values_off;	/* value lists which point to VK records */
+	uint32_t sk_off;		/* offset to SK record */
 	
 	/* link in the other records here */
 	
@@ -192,21 +192,21 @@ typedef struct {
 	/* file format information */
 
 	char   header[REGF_HDR_SIZE];	/* "regf" */
-	uint32 data_offset;		/* offset to record in the first (or any?) hbin block */
-	uint32 last_block;		/* offset to last hbin block in file */
-	uint32 checksum;		/* XOR of bytes 0x0000 - 0x01FB */
+	uint32_t data_offset;		/* offset to record in the first (or any?) hbin block */
+	uint32_t last_block;		/* offset to last hbin block in file */
+	uint32_t checksum;		/* XOR of bytes 0x0000 - 0x01FB */
 	NTTIME mtime;
 	
 	REGF_SK_REC *sec_desc_list;	/* list of security descriptors referenced by NK records */
 
 	/* unknowns used to simply writing */
 	
-	uint32 unknown1;
-	uint32 unknown2;
-	uint32 unknown3;
-	uint32 unknown4;
-	uint32 unknown5;
-	uint32 unknown6;
+	uint32_t unknown1;
+	uint32_t unknown2;
+	uint32_t unknown3;
+	uint32_t unknown4;
+	uint32_t unknown5;
+	uint32_t unknown6;
 	
 } REGF_FILE;