[SCM] Samba Shared Repository - branch v3-0-test updated -
release-3-0-32-74-gd326dc7
Jeremy Allison
jra at samba.org
Tue Nov 25 23:57:59 GMT 2008
The branch, v3-0-test has been updated
via d326dc7dc08acbb7bf511ca9579cefe591b0ba94 (commit)
from 649572c454328b81714b86d3f99f730bf61625e0 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -----------------------------------------------------------------
commit d326dc7dc08acbb7bf511ca9579cefe591b0ba94
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 25 15:57:18 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 d9cd446..40da1d6 100644
--- a/source/utils/smbtree.c
+++ b/source/utils/smbtree.c
@@ -31,15 +31,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;
pstring 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);
@@ -48,10 +48,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;
@@ -199,7 +199,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