aft.c ls -lm: Fix unmapping of lyrics file.

[paraslash.git] / aft.c

diff --git a/aft.c b/aft.c
index 292cabea20260681a48c738ee99f0fcb672138df..192c9bdf546bc4bb5dad448ce6d2293ffa2a0fa3 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -622,6 +622,7 @@ int load_afd(int shmid, struct audio_file_data *afd)
  * Mmap the given audio file and update statistics.
  *
  * \param aft_row Determines the audio file to be opened and updated.
+ * \param score The score of the audio file.
  * \param afd Result pointer.
  *
  * On success, the numplayed field of the audio file selector info is increased
@@ -630,8 +631,8 @@ int load_afd(int shmid, struct audio_file_data *afd)
  *
  * \return Positive shmid on success, negative on errors.
  */
-int open_and_update_audio_file(struct osl_row *aft_row,
-       struct audio_file_data *afd, long score)
+int open_and_update_audio_file(struct osl_row *aft_row, long score,
+       struct audio_file_data *afd)
 {
        HASH_TYPE *aft_hash, file_hash[HASH_SIZE];
        struct osl_object afsi_obj;
@@ -962,7 +963,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
                        lyrics_def.data? (char *)lyrics_def.data : ""
                );
                if (lyrics_def.data)
-                       osl_close_disk_object(lyrics_def.data);
+                       osl_close_disk_object(&lyrics_def);
        }
        free(att_lines);
        free(lyrics_lines);
@@ -974,25 +975,25 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 void make_empty_status_items(char *buf)
 {
        sprintf(buf,
-               "%s:\n" /* path */
-               "%s:\n" /* dirname */
-               "%s:\n" /* basename */
-               "%s:\n" /* score */
-               "%s:\n" /* attributes bitnmap */
-               "%s:\n" /* attributes txt */
-               "%s:\n" /* hash */
-               "%s:\n" /* image id */
-               "%s:\n" /* image name */
-               "%s:\n" /* lyrics id */
-               "%s:\n" /* lyrics name */
-               "%s:\n" /* bitrate */
-               "%s:\n" /* format */
-               "%s:\n" /* frequency */
-               "%s:\n" /* channels */
-               "%s:\n" /* duration */
-               "%s:\n" /* seconds total */
-               "%s:\n" /* num played */
-               "%s:\n" /* last played */
+               "%s: \n" /* path */
+               "%s: \n" /* dirname */
+               "%s: \n" /* basename */
+               "%s: \n" /* score */
+               "%s: \n" /* attributes bitnmap */
+               "%s: \n" /* attributes txt */
+               "%s: \n" /* hash */
+               "%s: \n" /* image id */
+               "%s: \n" /* image name */
+               "%s: \n" /* lyrics id */
+               "%s: \n" /* lyrics name */
+               "%s: \n" /* bitrate */
+               "%s: \n" /* format */
+               "%s: \n" /* frequency */
+               "%s: \n" /* channels */
+               "%s: \n" /* duration */
+               "%s: \n" /* seconds total */
+               "%s: \n" /* num played */
+               "%s: \n" /* last played */
                ,
                status_item_list[SI_PATH],
                status_item_list[SI_DIRECTORY],