svn commit: samba r5134 - in branches/SAMBA_4_0/source: include lib/registry lib/registry/common lib/registry/tools

[metze at samba.org]

Author: metze
Date: 2005-01-31 15:58:54 +0000 (Mon, 31 Jan 2005)
New Revision: 5134

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5134

Log:
- fix types to always use _t types

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

metze

Modified:
   branches/SAMBA_4_0/source/include/registry.h
   branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
   branches/SAMBA_4_0/source/lib/registry/common/reg_util.c
   branches/SAMBA_4_0/source/lib/registry/reg_backend_nt4.c
   branches/SAMBA_4_0/source/lib/registry/reg_backend_w95.c
   branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/registry.h
===================================================================
--- branches/SAMBA_4_0/source/include/registry.h	2005-01-31 15:54:42 UTC (rev 5133)
+++ branches/SAMBA_4_0/source/include/registry.h	2005-01-31 15:58:54 UTC (rev 5134)
@@ -138,7 +138,7 @@
 	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 @@
  * 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 {

Modified: branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c	2005-01-31 15:54:42 UTC (rev 5133)
+++ branches/SAMBA_4_0/source/lib/registry/common/reg_interface.c	2005-01-31 15:58:54 UTC (rev 5134)
@@ -426,7 +426,7 @@
 	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 @@
 	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 @@
 	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;

Modified: branches/SAMBA_4_0/source/lib/registry/common/reg_util.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/common/reg_util.c	2005-01-31 15:54:42 UTC (rev 5133)
+++ branches/SAMBA_4_0/source/lib/registry/common/reg_util.c	2005-01-31 15:58:54 UTC (rev 5134)
@@ -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 @@
       		(*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 @@
 	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;

Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_nt4.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/reg_backend_nt4.c	2005-01-31 15:54:42 UTC (rev 5133)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_nt4.c	2005-01-31 15:58:54 UTC (rev 5134)
@@ -306,6 +306,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "system/filesys.h"
 #include "system/shmem.h"
 
 #define REG_KEY_LIST_SIZE 10

Modified: branches/SAMBA_4_0/source/lib/registry/reg_backend_w95.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/reg_backend_w95.c	2005-01-31 15:54:42 UTC (rev 5133)
+++ branches/SAMBA_4_0/source/lib/registry/reg_backend_w95.c	2005-01-31 15:58:54 UTC (rev 5134)
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "system/filesys.h"
 #include "system/shmem.h"
 
 /**

Modified: branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c	2005-01-31 15:54:42 UTC (rev 5133)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regpatch.c	2005-01-31 15:58:54 UTC (rev 5134)
@@ -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