From 2c11b73391551723e4ada8664b1ba77873420217 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Wed, 23 Sep 2009 20:46:08 +0200 Subject: s3-registry: use push_reg_sz(). Guenther --- source3/registry/reg_backend_db.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/registry/reg_backend_db.c') diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index dec43ae741..b9ff5dc7fc 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -250,7 +250,7 @@ WERROR init_registry_key(const char *add_path) static void regdb_ctr_add_value(struct regval_ctr *ctr, struct builtin_regkey_value *value) { - UNISTR2 data; + DATA_BLOB data; switch(value->type) { case REG_DWORD: @@ -260,10 +260,10 @@ static void regdb_ctr_add_value(struct regval_ctr *ctr, break; case REG_SZ: - init_unistr2(&data, value->data.string, UNI_STR_TERMINATE); + push_reg_sz(talloc_tos(), &data, value->data.string); regval_ctr_addvalue(ctr, value->valuename, REG_SZ, - (char*)data.buffer, - data.uni_str_len*sizeof(uint16)); + (char*)data.data, + data.length); break; default: -- cgit From 1b0f3b7e3a3eadb1c9997b38dd41aa4c09c41a46 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 24 Sep 2009 15:01:32 +0200 Subject: s3-registry: use regval_ctr_addvalue_sz(). Greatly simplifies and cleanes up the code. Guenther --- source3/registry/reg_backend_db.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source3/registry/reg_backend_db.c') diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c index b9ff5dc7fc..2b6259c03a 100644 --- a/source3/registry/reg_backend_db.c +++ b/source3/registry/reg_backend_db.c @@ -250,8 +250,6 @@ WERROR init_registry_key(const char *add_path) static void regdb_ctr_add_value(struct regval_ctr *ctr, struct builtin_regkey_value *value) { - DATA_BLOB data; - switch(value->type) { case REG_DWORD: regval_ctr_addvalue(ctr, value->valuename, REG_DWORD, @@ -260,10 +258,8 @@ static void regdb_ctr_add_value(struct regval_ctr *ctr, break; case REG_SZ: - push_reg_sz(talloc_tos(), &data, value->data.string); - regval_ctr_addvalue(ctr, value->valuename, REG_SZ, - (char*)data.data, - data.length); + regval_ctr_addvalue_sz(ctr, value->valuename, + value->data.string); break; default: -- cgit