From 2fc610caf5c4a54556464623976d5f92871c49c9 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 30 Mar 2012 14:33:39 +0200 Subject: s3:registry: rename regval_ctr_key_exists() to regval_ctr_value_exists() Signed-off-by: Andreas Schneider --- source3/registry/reg_backend_db.c | 4 ++-- source3/registry/reg_objects.c | 2 +- source3/registry/reg_objects.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source3') diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index 21d229ef22..6716dd781f 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -337,7 +337,7 @@ static NTSTATUS init_registry_data_action(struct db_context *db, /* preserve existing values across restarts. Only add new ones */ - if (!regval_ctr_key_exists(values, + if (!regval_ctr_value_exists(values, builtin_registry_values[i].valuename)) { regdb_ctr_add_value(values, @@ -384,7 +384,7 @@ WERROR init_registry_data(void) regdb_fetch_values_internal(regdb, builtin_registry_values[i].path, values); - if (!regval_ctr_key_exists(values, + if (!regval_ctr_value_exists(values, builtin_registry_values[i].valuename)) { TALLOC_FREE(values); diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c index 7c64569c3c..6336d00657 100644 --- a/source3/registry/reg_objects.c +++ b/source3/registry/reg_objects.c @@ -395,7 +395,7 @@ struct regval_blob *regval_ctr_specific_value(struct regval_ctr *ctr, Check for the existance of a value **********************************************************************/ -bool regval_ctr_key_exists(struct regval_ctr *ctr, const char *value) +bool regval_ctr_value_exists(struct regval_ctr *ctr, const char *value) { int i; diff --git a/source3/registry/reg_objects.h b/source3/registry/reg_objects.h index 144e97fcfc..52d078e678 100644 --- a/source3/registry/reg_objects.h +++ b/source3/registry/reg_objects.h @@ -53,7 +53,7 @@ char* regval_name(struct regval_blob *val); uint32_t regval_type(struct regval_blob *val); struct regval_blob* regval_ctr_specific_value(struct regval_ctr *ctr, uint32_t idx); -bool regval_ctr_key_exists(struct regval_ctr *ctr, const char *value); +bool regval_ctr_value_exists(struct regval_ctr *ctr, const char *value); struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name, uint32_t type, const uint8_t *data_p, size_t size); -- cgit