From: Andre Noll <maan@systemlinux.org>
Date: Sat, 12 Apr 2008 05:38:43 +0000 (+0200)
Subject: vss_preselect(): Use single return.
X-Git-Tag: v0.3.3~99
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=74097b7a166823e4eeadfb8b180abdc294cdb633;ds=inline

vss_preselect(): Use single return.
---

diff --git a/vss.c b/vss.c
index 1be4cd15..74fdb2b4 100644
--- a/vss.c
+++ b/vss.c
@@ -295,7 +295,8 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 	else {
 		if (vss_next()) {
 			vss_eof();
-			return vss_compute_timeout();
+			tv = vss_compute_timeout();
+			goto out;
 		}
 	}
 	if (vss_paused() || vss_repos()) {
@@ -317,7 +318,7 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 	}
 	tv = vss_compute_timeout();
 	if (tv)
-		return tv;
+		goto out;
 	if (!map && vss_playing() &&
 			!(mmd->new_vss_status_flags & VSS_NOMORE)) {
 		if (afsss == AFS_SOCKET_READY ||
@@ -327,6 +328,7 @@ struct timeval *vss_preselect(fd_set *rfds, fd_set *wfds, int *max_fileno)
 			afsss = AFS_SOCKET_CHECK_FOR_WRITE;
 		}
 	}
+out:
 	return tv;
 }