From: Andre Noll <maan@systemlinux.org>
Date: Wed, 24 Jul 2013 22:43:28 +0000 (+0200)
Subject: mood: Simplify compute_dynamic_score().
X-Git-Tag: v0.5.1~6^2~4
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=5e9ded6843a720a4d234ba63143d14e05f4746b4;p=paraslash.git

mood: Simplify compute_dynamic_score().

Never use one housekeeping variable when you could just as easily
use two or three. - Roedy Green: How To Write Unmaintainable Code
---

diff --git a/mood.c b/mood.c
index 833820a8..e60ef2fd 100644
--- a/mood.c
+++ b/mood.c
@@ -477,16 +477,10 @@ static long compute_last_played_score(struct afs_info *afsi)
 static long compute_dynamic_score(const struct osl_row *aft_row)
 {
 	struct afs_info afsi;
-	int64_t score, nscore = 0, lscore = 0;
-	int ret;
 
-	ret = get_afsi_of_row(aft_row, &afsi);
-	if (ret < 0)
+	if (get_afsi_of_row(aft_row, &afsi) < 0)
 		return -100;
-	nscore = compute_num_played_score(&afsi);
-	lscore = compute_last_played_score(&afsi);
-	score = nscore + lscore;
-	return score;
+	return compute_num_played_score(&afsi) + compute_last_played_score(&afsi);
 }
 
 static int add_afs_statistics(const struct osl_row *row)