From ad53de9d599d9ca1b935754d93b455a89198fa37 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 30 Apr 2006 19:22:56 +0000 Subject: r15364: Use global list of predefined keys (This used to be commit eee9e33442f846d278f0fc545480cc2ec8ea295b) --- source4/lib/registry/tools/regshell.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index b71c15cb67..6bcaf42b6c 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -439,23 +439,11 @@ static char **reg_completion(const char *text, int start, int end) } if (h) { - uint32_t try_hkeys[] = { - HKEY_CLASSES_ROOT, - HKEY_CURRENT_USER, - HKEY_LOCAL_MACHINE, - HKEY_USERS, - HKEY_PERFORMANCE_DATA, - HKEY_CURRENT_CONFIG, - HKEY_DYN_DATA, - HKEY_PERFORMANCE_TEXT, - HKEY_PERFORMANCE_NLSTEXT, - 0 - }; int i; - for (i = 0; try_hkeys[i]; i++) { + for (i = 0; reg_predefined_keys[i].handle; i++) { WERROR err; - err = reg_get_predefined_key(h, try_hkeys[i], &curkey); + err = reg_get_predefined_key(h, reg_predefined_keys[i].handle, &curkey); if (W_ERROR_IS_OK(err)) { break; } else { -- cgit