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

Andrzej Hajda andrzej.hajda at wp.pl
Tue Oct 9 14:59:45 MDT 2012


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,
-- 
1.7.9.5



More information about the samba-technical mailing list