From 73a0b6ea476ee19bb814c3257daca7c116d42872 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 31 Jan 2005 15:58:54 +0000 Subject: r5134: - fix types to always use _t types - add #include "system/filesys.h" where needed metze (This used to be commit 6bb07a0ed8a4baaeaa1d63bde8ce773364860fd2) --- source4/lib/registry/common/reg_interface.c | 6 +++--- source4/lib/registry/common/reg_util.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source4/lib/registry/common') 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; -- cgit