Re-revert "Auto-adjust fecdec output buffer size."

[paraslash.git] / mood.c

diff --git a/mood.c b/mood.c
index 40f3cacbb7d672d4c1d6e1b60420e219e556a350..540d0c70bc7d20b0951e0dffa5deb10c7394104c 100644 (file)
--- a/mood.c
+++ b/mood.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -84,7 +84,7 @@ typedef void mood_cleanup_function(void *);
  * Used for scoring and to determine whether a file is admissible.
  */
 struct mood_method {
-       /* The name of the method. */
+       /** The name of the method. */
        const char *name;
        /** Pointer to the mood parser. */
        mood_parser *parser;
@@ -266,6 +266,7 @@ static int add_item_score(const struct osl_row *row, struct mood_item *item, lon
                ret = get_afhi_of_row(row, &afhi);
                if (ret< 0)
                        return ret;
+               free(afhi.info_string); /* don't need the tag info */
                ret = get_audio_file_path_of_row(row, &path);
                if (ret< 0)
                        return ret;
@@ -536,10 +537,10 @@ static int check_mood(struct osl_row *mood_row, void *data)
        struct osl_object mood_def;
        struct mood_line_parser_data mlpd = {.line_num = 0};
 
-       int ret2, ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
+       int ret = mood_get_name_and_def_by_row(mood_row, &mood_name, &mood_def);
 
        if (ret < 0) {
-               ret2 = para_printf(pb, "failed to get mood definition: %s\n",
+               para_printf(pb, "failed to get mood definition: %s\n",
                        para_strerror(-ret));
                return ret;
        }
@@ -551,7 +552,7 @@ static int check_mood(struct osl_row *mood_row, void *data)
        ret = for_each_line_ro(mood_def.data, mood_def.size,
                parse_mood_line, &mlpd);
        if (ret < 0)
-               ret2 = para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
+               para_printf(pb, "%s line %u: %s\n", mood_name, mlpd.line_num,
                        para_strerror(-ret));
 out:
        osl_close_disk_object(&mood_def);