diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:39:35 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:39:35 +0100 |
| commit | 09ac816b36e45fd537af2f7fe7c57a11f5c744f5 (patch) | |
| tree | 4d5d44c27a2395a39efc62359f6e4b6976f2ba2e /source3/client/client.c | |
| parent | 235244f4cc707130dd130afce88bde49606bd501 (diff) | |
| parent | 54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (diff) | |
| download | samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.tar.gz samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.tar.bz2 samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.zip | |
Merge branch 'master' of git://git.samba.org/samba into teventfix
Conflicts:
lib/tevent/pytevent.c
Diffstat (limited to 'source3/client/client.c')
| -rw-r--r-- | source3/client/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 2f9e3c0d49..aaa9e35d96 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -1784,13 +1784,13 @@ static struct file_list { Free a file_list structure. ****************************************************************************/ -static void free_file_list (struct file_list *list_head) +static void free_file_list (struct file_list *l_head) { struct file_list *list, *next; - for (list = list_head; list; list = next) { + for (list = l_head; list; list = next) { next = list->next; - DLIST_REMOVE(list_head, list); + DLIST_REMOVE(l_head, list); SAFE_FREE(list->file_path); SAFE_FREE(list); } |