The branch, master has been updated via 7a46156 regedit: Rename variable to fix compile warning via 693ba26 s3/vfs: bump interface version number to 33 from a4157e7 spoolss: retrieve published printer GUID if not in registry
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 7a4615656937d94d203cb2919b08ed237bba6764 Author: Christof Schmitt <c...@samba.org> Date: Wed Feb 18 14:42:11 2015 -0700 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 <c...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Thu Feb 19 01:31:44 CET 2015 on sn-devel-104 commit 693ba266c7d84d37b0f5d4253a6a87dc6ddd2b71 Author: David Disseldorp <dd...@samba.org> Date: Wed Feb 18 12:01:14 2015 +0100 s3/vfs: bump interface version number to 33 The SMB_VFS_DISK_FREE() small_query parameter removal cleanup will not be merged for Samba 4.2, so the master SMB_VFS_INTERFACE_VERSION number should be bumped above what's currently present in the 4.2 branch. Signed-off-by: David Disseldorp <dd...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/include/vfs.h | 3 ++- source3/utils/regedit_treeview.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/vfs.h b/source3/include/vfs.h index 3444f62..13143c2 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -162,8 +162,9 @@ /* Version 32 - Add SMB_VFS_READDIR_ATTR() */ /* Version 32 - Add in and out create context blobs to create_file */ /* Version 32 - Remove unnecessary SMB_VFS_DISK_FREE() small_query parameter */ +/* Bump to version 33 - Samba 4.3 will ship with that. */ -#define SMB_VFS_INTERFACE_VERSION 32 +#define SMB_VFS_INTERFACE_VERSION 33 /* All intercepted VFS operations must be declared as static functions inside module source diff --git a/source3/utils/regedit_treeview.c b/source3/utils/regedit_treeview.c index ece15e5..f9e4d0a 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; -- Samba Shared Repository