compute_mood_score(): Rename "row" parameter to "aft_row".
authorAndre Noll <maan@systemlinux.org>
Tue, 25 Sep 2007 08:53:52 +0000 (10:53 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 25 Sep 2007 08:53:52 +0000 (10:53 +0200)
mood.c

diff --git a/mood.c b/mood.c
index 8d257e0..1dc401c 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -261,7 +261,7 @@ static int add_item_score(const struct osl_row *row, struct mood_item *item, lon
        return 1;
 }
 
-static int compute_mood_score(const struct osl_row *row, long *result)
+static int compute_mood_score(const struct osl_row *aft_row, long *result)
 {
        struct mood_item *item;
        int match = 0;
@@ -271,16 +271,16 @@ static int compute_mood_score(const struct osl_row *row, long *result)
                return -E_NO_MOOD;
        /* reject audio file if it matches any entry in the deny list */
        list_for_each_entry(item, &current_mood->deny_list, mood_item_node)
-               if (add_item_score(row, item, &score, &score_arg_sum) > 0)
+               if (add_item_score(aft_row, item, &score, &score_arg_sum) > 0)
                        return -E_NOT_ADMISSIBLE;
        list_for_each_entry(item, &current_mood->accept_list, mood_item_node)
-               if (add_item_score(row, item, &score, &score_arg_sum) > 0)
+               if (add_item_score(aft_row, item, &score, &score_arg_sum) > 0)
                        match = 1;
        /* reject if there is no matching entry in the accept list */
        if (!match && !list_empty(&current_mood->accept_list))
                return -E_NOT_ADMISSIBLE;
        list_for_each_entry(item, &current_mood->score_list, mood_item_node)
-               add_item_score(row, item, &score, &score_arg_sum);
+               add_item_score(aft_row, item, &score, &score_arg_sum);
        if (score_arg_sum)
                score /= score_arg_sum;
        *result = score;