Kill more duplicate status items.

Image ID and Lyrics ID are also contained in the ls -v output.

diff --git a/command.c b/command.c
index b2dca3a36b4665e8423042b2eea26b759cb96c92..a029cfadfb2ccf15aeb9610ed971f223da71fcca 100644 (file)
--- a/command.c
+++ b/command.c
@@ -116,10 +116,10 @@ static char *get_status(struct misc_meta_data *nmmd)
        gettimeofday(&now, NULL);
        ret = make_message(
                "%s:%zu\n"      "%s:%s\n"               "%s:%lu\n"      "%s:%u\n"
        gettimeofday(&now, NULL);
        ret = make_message(
                "%s:%zu\n"      "%s:%s\n"               "%s:%lu\n"      "%s:%u\n"

-               "%s:%s\n"       "%s:%s\n"       "%s:%s\n"       "%s:%u\n"
+               "%s:%s\n"       "%s:%s\n"       "%s:%s\n"

                "%s:%li\n"      "%s:%s\n" "%s"
                "%s:%s\n"       "%s:%lu.%lu\n"  "%s:%lu.%lu\n"
                "%s:%li\n"      "%s:%s\n" "%s"
                "%s:%s\n"       "%s:%lu.%lu\n"  "%s:%lu.%lu\n"

-               "%s:%s\n"       "%s:%u\n"       "%s\n",
+               "%s:%s\n"       "%s\n",

                status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
                status_item_list[SI_MTIME], mtime,
                status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
                status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
                status_item_list[SI_MTIME], mtime,
                status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,


@@ -128,7 +128,6 @@ static char *get_status(struct misc_meta_data *nmmd)
                status_item_list[SI_BASENAME], basename ? basename : "(none)",
                status_item_list[SI_STATUS], status,
                status_item_list[SI_STATUS_FLAGS], flags,
                status_item_list[SI_BASENAME], basename ? basename : "(none)",
                status_item_list[SI_STATUS], status,
                status_item_list[SI_STATUS_FLAGS], flags,

-               status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id,

 
                status_item_list[SI_OFFSET], offset,
                status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
 
                status_item_list[SI_OFFSET], offset,
                status_item_list[SI_AFS_MODE], mmd->afs_mode_string,


@@ -143,7 +142,6 @@ static char *get_status(struct misc_meta_data *nmmd)
                        (long unsigned)now.tv_usec,
 
                status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",
                        (long unsigned)now.tv_usec,
 
                status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",

-               status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id,

                nmmd->afd.afs_status_info
 
        );
                nmmd->afd.afs_status_info
 
        );