[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4525-g528e01f
Jeremy Allison
jra at samba.org
Tue Nov 25 23:55:38 GMT 2008
The branch, v3-3-test has been updated
via 528e01f402e54f8d6c1b74a5b7647c037f456412 (commit)
from dc7c2d63b3ce142959aa863f000fa9140de99eb0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 528e01f402e54f8d6c1b74a5b7647c037f456412
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 25 15:54:53 2008 -0800
Fix bug #5914 - Build failure: redefinition of struct name_list
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source/utils/smbtree.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/utils/smbtree.c b/source/utils/smbtree.c
index ce2de4d..9fc02ba 100644
--- a/source/utils/smbtree.c
+++ b/source/utils/smbtree.c
@@ -30,15 +30,15 @@ static enum tree_level level = LEV_SHARE;
/* Holds a list of workgroups or servers */
-struct name_list {
- struct name_list *prev, *next;
+struct smb_name_list {
+ struct smb_name_list *prev, *next;
char *name, *comment;
uint32 server_type;
};
-static struct name_list *workgroups, *servers, *shares;
+static struct smb_name_list *workgroups, *servers, *shares;
-static void free_name_list(struct name_list *list)
+static void free_name_list(struct smb_name_list *list)
{
while(list)
DLIST_REMOVE(list, list);
@@ -47,10 +47,10 @@ static void free_name_list(struct name_list *list)
static void add_name(const char *machine_name, uint32 server_type,
const char *comment, void *state)
{
- struct name_list **name_list = (struct name_list **)state;
- struct name_list *new_name;
+ struct smb_name_list **name_list = (struct smb_name_list **)state;
+ struct smb_name_list *new_name;
- new_name = SMB_MALLOC_P(struct name_list);
+ new_name = SMB_MALLOC_P(struct smb_name_list);
if (!new_name)
return;
@@ -222,7 +222,7 @@ static bool get_shares(char *server_name, struct user_auth_info *user_info)
static bool print_tree(struct user_auth_info *user_info)
{
- struct name_list *wg, *sv, *sh;
+ struct smb_name_list *wg, *sv, *sh;
/* List workgroups */
--
Samba Shared Repository
More information about the samba-cvs
mailing list