vss_preselect(): Use single return.

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index 1be4cd15d1db262dd5f79a43b19e7bba09f2087a..74fdb2b4bbd5a0abec2a0374cac19026e95e10cc 100644 (file)
--- 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;
 }