X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=57d3917e68c2cd5f5a91de5a668d116e5ac9faed;hp=74141b9e3b5dc14d4a2ab70ed9138f2645e4debe;hb=07caf51b881e2f8e93fbcf529ea1a9b14a40f82e;hpb=152ea84aba06555f8b828fce19d9531e97ff0b21 diff --git a/command.c b/command.c index 74141b9e..57d3917e 100644 --- a/command.c +++ b/command.c @@ -97,7 +97,7 @@ static char *vss_get_status_flags(unsigned int flags) static char *get_status(struct misc_meta_data *nmmd) { - char *bar, *ret, mtime[30] = ""; + char *basename, *ret, mtime[30] = ""; char *status, *flags; /* vss status info */ char *ut = uptime_str(); long offset = (nmmd->offset + 500) / 1000; @@ -109,7 +109,7 @@ static char *get_status(struct misc_meta_data *nmmd) /* report real status */ status = vss_status_tohuman(nmmd->vss_status_flags); flags = vss_get_status_flags(nmmd->vss_status_flags); - bar = para_basename(nmmd->filename); + basename = para_basename(nmmd->filename); gettimeofday(&now, NULL); ret = make_message( "%s:%zu\n" "%s:%s\n" "%s:%lu\n" "%s:%u\n" @@ -121,7 +121,7 @@ static char *get_status(struct misc_meta_data *nmmd) status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total, status_item_list[SI_NUM_PLAYED], nmmd->num_played, - status_item_list[SI_STATUS_BAR], bar ? bar : "(none)", + 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_SELECTOR], "FIXME", @@ -141,7 +141,7 @@ static char *get_status(struct misc_meta_data *nmmd) status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string ); - free(bar); + free(basename); free(flags); free(status); free(ut);