[PATCH 12/12] build: Removed function name conflict from s3/torture

[Andrew Bartlett]

On Tue, 2012-10-09 at 22:59 +0200, Andrzej Hajda wrote:
> Signed-off-by: Andrzej Hajda <andrzej.hajda at wp.pl>
> ---
>  source3/torture/vfstest.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
> index 3b47459..584cf2a 100644
> --- a/source3/torture/vfstest.c
> +++ b/source3/torture/vfstest.c
> @@ -405,15 +405,15 @@ static void process_file(struct vfs_state *pvfs, char *filename) {
>  	}
>  }
>  
> -void exit_server(const char *reason)
> +static void vfstest_exit_server(const char *reason)
>  {
>  	DEBUG(3,("Server exit (%s)\n", (reason ? reason : "")));
>  	exit(0);
>  }
>  
> -void exit_server_cleanly(const char *const reason)
> +void vfstest_exit_server_cleanly(const char *const reason)
>  {
> -	exit_server("normal exit");
> +	vfstest_exit_server("normal exit");
>  }
>  
>  struct smb_request *vfstest_get_smbreq(TALLOC_CTX *mem_ctx,

This looks wrong.  Either the function is unused (and should be
removed), or some caller also needs to be fixed up.

It might be a waf/autoconf difference, in which case we should probably
just remove vfstest from the autoconf build (this is a developer and
testing tool that really doesn't need to be built with autoconf). 

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org