From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 4 Sep 2012 07:18:45 +0000 (+1000)
Subject: file_server: Clarify code by avoiding a goto
X-Git-Tag: samba-4.0.0rc1~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c9d22d1ed5cc886b7a7c886f7298fea8c60089c;p=thirdparty%2Fsamba.git

file_server: Clarify code by avoiding a goto

As suggested by Ricky Nance <ricky.nance@weaubleau.k12.mo.us>

Andrew Bartlett
---

diff --git a/file_server/file_server.c b/file_server/file_server.c
index a3efcb2418d..e1560c202db 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -117,15 +117,13 @@ static void s3fs_task_init(struct task_server *task)
 				NULL);
 	if (req == NULL) {
 		DEBUG(0, ("Failed to start smbd as child daemon\n"));
-		goto failed;
+		task_server_terminate(task, "Failed to startup s3fs smb task", true);
+		return;
 	}
 
 	tevent_req_set_callback(req, file_server_smbd_done, task);
 
 	DEBUG(1,("Started file server smbd with config %s\n", fileserver_conf));
-	return;
-failed:
-	task_server_terminate(task, "Failed to startup s3fs smb task", true);
 }
 
 /* called at smbd startup - register ourselves as a server service */