From ed7e7efd20f6be0968f8a7d7bd38ff8365ee8e6d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 16 Dec 2006 09:36:10 +0000 Subject: r20210: registry_fetch_values is not needed anymore, fix typo (This used to be commit 77e556f4a358fec0d754e50417097bf5a874c500) --- source3/registry/reg_frontend.c | 57 ----------------------------------------- source3/registry/reg_printing.c | 2 +- 2 files changed, 1 insertion(+), 58 deletions(-) (limited to 'source3/registry') diff --git a/source3/registry/reg_frontend.c b/source3/registry/reg_frontend.c index e0907c2dbd..36aacaceba 100644 --- a/source3/registry/reg_frontend.c +++ b/source3/registry/reg_frontend.c @@ -189,63 +189,6 @@ int fetch_reg_values( REGISTRY_KEY *key, REGVAL_CTR *val ) return result; } -WERROR registry_fetch_values(TALLOC_CTX *mem_ctx, REGISTRY_KEY *key, - uint32 *pnum_values, char ***pnames, - struct registry_value ***pvalues) -{ - REGVAL_CTR *ctr; - char **names; - struct registry_value **values; - uint32 i; - - if (!(ctr = TALLOC_ZERO_P(mem_ctx, REGVAL_CTR))) { - return WERR_NOMEM; - } - - if (fetch_reg_values(key, ctr) == -1) { - TALLOC_FREE(ctr); - return WERR_INVALID_PARAM; - } - - if (ctr->num_values == 0) { - *pnum_values = 0; - TALLOC_FREE(ctr); - return WERR_OK; - } - - if ((!(names = TALLOC_ARRAY(ctr, char *, ctr->num_values))) || - (!(values = TALLOC_ARRAY(ctr, struct registry_value *, - ctr->num_values)))) { - TALLOC_FREE(ctr); - return WERR_NOMEM; - } - - for (i=0; inum_values; i++) { - REGISTRY_VALUE *val = ctr->values[i]; - WERROR err; - - if (!(names[i] = talloc_strdup(names, val->valuename))) { - TALLOC_FREE(ctr); - return WERR_NOMEM; - } - - err = registry_pull_value(values, &values[i], - val->type, val->data_p, - val->size, val->size); - if (!W_ERROR_IS_OK(err)) { - TALLOC_FREE(ctr); - return err; - } - } - - *pnum_values = ctr->num_values; - *pnames = talloc_move(mem_ctx, &names); - *pvalues = talloc_move(mem_ctx, &values); - - TALLOC_FREE(ctr); - return WERR_OK; -} - /*********************************************************************** High level access check for passing the required access mask to the underlying registry backend diff --git a/source3/registry/reg_printing.c b/source3/registry/reg_printing.c index c20d5ab96f..90455a82cb 100644 --- a/source3/registry/reg_printing.c +++ b/source3/registry/reg_printing.c @@ -478,7 +478,7 @@ static int key_printers_fetch_values( const char *key, REGVAL_CTR *values ) /* top level key values stored in the registry has no values */ if ( !printers_key ) { - /* normalize to the 'HKLM\SOFTWARE\...\Print\Printers' ket */ + /* normalize to the 'HKLM\SOFTWARE\...\Print\Printers' key */ return regdb_fetch_values( KEY_WINNT_PRINTERS, values ); } -- cgit