From 490b7794cdcdc0a776288c4eb3b809ec8ee7eb92 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 30 Mar 2012 14:33:39 +0200 Subject: [PATCH] s3:registry: rename regval_ctr_key_exists() to regval_ctr_value_exists() (cherry picked from commit 60cdf3c8b5bbda9434f0d8a05fc581ab41b42d5c) (cherry picked from commit b712448006fe5d31d9c8db164ffd7b0f0ee1191f) --- 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(-) diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index 11bbe7ed36a..f65f26df36a 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -320,7 +320,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, @@ -364,7 +364,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 980986f95bf..de0de2c5d0c 100644 --- a/source3/registry/reg_objects.c +++ b/source3/registry/reg_objects.c @@ -446,7 +446,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 a84bc8a80bc..0599bfeedd4 100644 --- a/source3/registry/reg_objects.h +++ b/source3/registry/reg_objects.h @@ -55,7 +55,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); -- 2.11.4.GIT