r5134: - fix types to always use _t types

- add #include "system/filesys.h" where needed

metze
(This used to be commit 6bb07a0ed8a4baaeaa1d63bde8ce773364860fd2)

6 files changed, 13 insertions, 10 deletions

diff --git a/source4/include/registry.h b/source4/include/registry.h
index bec68a0dfa..05bcf76ad5 100644
--- a/source4/include/registry.h
+++ b/source4/include/registry.h
@@ -138,7 +138,7 @@ struct hive_operations {
 	WERROR (*flush_key) (struct registry_key *);
 
 	/* Value management */
-	WERROR (*set_value)(struct registry_key *, const char *name, uint32 type, void *data, int len); 
+	WERROR (*set_value)(struct registry_key *, const char *name, uint32_t type, void *data, int len); 
 	WERROR (*del_value)(struct registry_key *, const char *valname);
 };
 
@@ -153,7 +153,7 @@ struct registry_hive {
  * contains zero or more hives */
 struct registry_context {
     void *backend_data;
-	WERROR (*get_predefined_key) (struct registry_context *, uint32 hkey, struct registry_key **);
+	WERROR (*get_predefined_key) (struct registry_context *, uint32_t hkey, struct registry_key **);
 };
 
 struct reg_init_function_entry {
diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index 8385cef108..42bf8f9389 100644
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -426,7 +426,7 @@ WERROR reg_key_add_name(TALLOC_CTX *mem_ctx, struct registry_key *parent, const
 	return WERR_OK;
 }
 
-WERROR reg_val_set(struct registry_key *key, const char *value, uint32 type, void *data, int len)
+WERROR reg_val_set(struct registry_key *key, const char *value, uint32_t type, void *data, int len)
 {
 	/* A 'real' set function has preference */
 	if (key->hive->functions->set_value) 
@@ -470,7 +470,7 @@ WERROR reg_key_flush(struct registry_key *key)
 	return WERR_OK;
 }
 
-WERROR reg_key_subkeysizes(struct registry_key *key, uint32 *max_subkeylen, uint32 *max_subkeysize)
+WERROR reg_key_subkeysizes(struct registry_key *key, uint32_t *max_subkeylen, uint32_t *max_subkeysize)
 {
 	int i = 0; 
 	struct registry_key *subkey;
@@ -495,7 +495,7 @@ WERROR reg_key_subkeysizes(struct registry_key *key, uint32 *max_subkeylen, uint
 	return WERR_OK;
 }
 
-WERROR reg_key_valuesizes(struct registry_key *key, uint32 *max_valnamelen, uint32 *max_valbufsize)
+WERROR reg_key_valuesizes(struct registry_key *key, uint32_t *max_valnamelen, uint32_t *max_valbufsize)
 {
 	int i = 0; 
 	struct registry_value *value;
diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index b11b24151e..d4fdc59d70 100644
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -25,7 +25,7 @@
 #define DBGC_CLASS DBGC_REGISTRY
 
 static const struct {
-	uint32 id;
+	uint32_t id;
 	const char *name;
 } reg_value_types[] = {
 	{ REG_SZ, "REG_SZ" },
@@ -122,9 +122,9 @@ BOOL reg_string_to_val(TALLOC_CTX *mem_ctx, const char *type_str, const char *da
       		(*value)->data_len = convert_string_talloc(mem_ctx, CH_UNIX, CH_UTF16, data_str, strlen(data_str), &(*value)->data_blk);
 			break;
 		case REG_DWORD:
-			(*value)->data_len = sizeof(uint32);
-			(*value)->data_blk = talloc(mem_ctx, uint32);
-			*((uint32 *)(*value)->data_blk) = strtol(data_str, NULL, 0);
+			(*value)->data_len = sizeof(uint32_t);
+			(*value)->data_blk = talloc(mem_ctx, uint32_t);
+			*((uint32_t *)(*value)->data_blk) = strtol(data_str, NULL, 0);
 			break;
 
 		case REG_NONE:
@@ -269,7 +269,7 @@ WERROR reg_key_del_abs(struct registry_context *ctx, const char *path)
 	return error;
 }
 
-WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx, const char *path, uint32 access_mask, struct security_descriptor *sec_desc, struct registry_key **result)
+WERROR reg_key_add_abs(TALLOC_CTX *mem_ctx, struct registry_context *ctx, const char *path, uint32_t access_mask, struct security_descriptor *sec_desc, struct registry_key **result)
 {
 	struct registry_key *parent;
 	const char *n;
diff --git a/source4/lib/registry/reg_backend_nt4.c b/source4/lib/registry/reg_backend_nt4.c
index 88033a8a8b..d700070cde 100644
--- a/source4/lib/registry/reg_backend_nt4.c
+++ b/source4/lib/registry/reg_backend_nt4.c
@@ -306,6 +306,7 @@ Hope this helps....  (Although it was "fun" for me to uncover this things,
 
 #include "includes.h"
 #include "registry.h"
+#include "system/filesys.h"
 #include "system/shmem.h"
 
 #define REG_KEY_LIST_SIZE 10
diff --git a/source4/lib/registry/reg_backend_w95.c b/source4/lib/registry/reg_backend_w95.c
index ff02f4d12b..45b6105801 100644
--- a/source4/lib/registry/reg_backend_w95.c
+++ b/source4/lib/registry/reg_backend_w95.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "system/filesys.h"
 #include "system/shmem.h"
 
 /**
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 600c1f60e7..ee7568cc0f 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -24,6 +24,7 @@
 #include "dynconfig.h"
 #include "registry.h"
 #include "lib/cmdline/popt_common.h"
+#include "system/filesys.h"
 
 /*
  * Routines to parse a REGEDIT4 file