From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 6 Aug 2017 14:26:14 +0000 (+0200)
Subject: vss: Reduce indentation level in vss_send().
X-Git-Tag: v0.6.1~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=178fcf6a776ac60eaa55174c883f1c6735204670;hp=21859dc53e11f56e76a5db0f105ee65a20d09ab9

vss: Reduce indentation level in vss_send().

If the current chunk is not due yet, we return from the function.
Reversing the logic of the test allows to reduce indentation by
one level. No semantic change.
---

diff --git a/vss.c b/vss.c
index 6aac9d59..f1bb5798 100644
--- a/vss.c
+++ b/vss.c
@@ -1034,6 +1034,8 @@ static void vss_send(struct vss_task *vsst)
 	bool fec_active = false;
 	struct timeval due;
 	struct fec_client *fc, *tmp_fc;
+	char *buf;
+	size_t len;
 
 	if (!vsst->map || !vss_playing())
 		return;
@@ -1064,35 +1066,31 @@ static void vss_send(struct vss_task *vsst)
 	}
 	compute_chunk_time(mmd->chunks_sent, &mmd->afd.afhi.chunk_tv,
 		&mmd->stream_start, &due);
-	if (tv_diff(&due, now, NULL) <= 0) {
-		char *buf;
-		size_t len;
-
-		if (!mmd->chunks_sent) {
-			mmd->stream_start = *now;
-			mmd->events++;
-			set_mmd_offset();
-		}
-		ret = vss_get_chunk(mmd->current_chunk, vsst, &buf, &len);
-		if (ret < 0) {
-			PARA_ERROR_LOG("could not get chunk %lu: %s\n",
-				mmd->current_chunk, para_strerror(-ret));
-		} else {
-			/*
-			 * We call ->send() even if len is zero because senders
-			 * might have data queued which can be sent now.
-			 */
-			for (i = 0; senders[i].name; i++) {
-				if (!senders[i].send)
-					continue;
-				senders[i].send(mmd->current_chunk,
-					mmd->chunks_sent, buf, len,
-					vsst->header_buf, vsst->header_len);
-			}
+	if (tv_diff(&due, now, NULL) > 0)
+		return;
+	if (!mmd->chunks_sent) {
+		mmd->stream_start = *now;
+		mmd->events++;
+		set_mmd_offset();
+	}
+	ret = vss_get_chunk(mmd->current_chunk, vsst, &buf, &len);
+	if (ret < 0) {
+		PARA_ERROR_LOG("could not get chunk %lu: %s\n",
+			mmd->current_chunk, para_strerror(-ret));
+	} else {
+		/*
+		 * We call ->send() even if len is zero because senders might
+		 * have data queued which can be sent now.
+		 */
+		for (i = 0; senders[i].name; i++) {
+			if (!senders[i].send)
+				continue;
+			senders[i].send(mmd->current_chunk, mmd->chunks_sent,
+				buf, len, vsst->header_buf, vsst->header_len);
 		}
-		mmd->chunks_sent++;
-		mmd->current_chunk++;
 	}
+	mmd->chunks_sent++;
+	mmd->current_chunk++;
 }
 
 static int vss_post_select(struct sched *s, void *context)