diff options
| author | Christof Schmitt <cs@samba.org> | 2015-02-18 14:42:11 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-02-19 01:31:43 +0100 |
| commit | 7a4615656937d94d203cb2919b08ed237bba6764 (patch) | |
| tree | 4ce1f865346746dd53272200248f026c6c2f43d9 | |
| parent | 693ba266c7d84d37b0f5d4253a6a87dc6ddd2b71 (diff) | |
| download | samba-7a4615656937d94d203cb2919b08ed237bba6764.tar.gz samba-7a4615656937d94d203cb2919b08ed237bba6764.tar.xz samba-7a4615656937d94d203cb2919b08ed237bba6764.zip | |
regedit: Rename variable to fix compile warning
With --picky-developer this warning is turned into an error:
cc1: warnings being treated as errors
../source3/utils/regedit_treeview.c: In function ‘tree_node_load_children’:
../source3/utils/regedit_treeview.c:256: error: declaration of ‘key_name’ shadows a global declaration
/usr/include/ncurses.h:1419: error: shadowed declaration is here
Fix this by renaming the local variable.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Feb 19 01:31:44 CET 2015 on sn-devel-104
| -rw-r--r-- | source3/utils/regedit_treeview.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/regedit_treeview.c b/source3/utils/regedit_treeview.c index ece15e5239..f9e4d0a9fd 100644 --- a/source3/utils/regedit_treeview.c +++ b/source3/utils/regedit_treeview.c @@ -253,7 +253,7 @@ void tree_node_insert_sorted(struct tree_node *list, struct tree_node *node) WERROR tree_node_load_children(struct tree_node *node) { struct registry_key *key; - const char *key_name, *klass; + const char *reg_key_name, *klass; NTTIME modified; uint32_t i, nsubkeys, count; WERROR rv; @@ -274,18 +274,18 @@ WERROR tree_node_load_children(struct tree_node *node) for (count = 0, i = 0; i < nsubkeys; ++i) { rv = reg_key_get_subkey_by_index(node, node->key, i, - &key_name, &klass, + ®_key_name, &klass, &modified); if (!W_ERROR_IS_OK(rv)) { goto finish; } - rv = reg_open_key(node, node->key, key_name, &key); + rv = reg_open_key(node, node->key, reg_key_name, &key); if (!W_ERROR_IS_OK(rv)) { continue; } - array[count] = tree_node_new(array, node, key_name, key); + array[count] = tree_node_new(array, node, reg_key_name, key); if (array[count] == NULL) { rv = WERR_NOMEM; goto finish; |