From 2909afc63e70c46fe4f9384c8d4df10bac60026e Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Thu, 7 May 2015 18:17:54 +0200 Subject: [PATCH] Do not check return value of WRITE_STATUS_ITEM(). The previous commit removed error checking from para_printf(), but one instance remains: the WRITE_STATUS_ITEM() macro which also calls para_printf(). This patch removes the error checking code of this macro and adjusts all callers. --- aft.c | 146 ++++++++++++++--------------------------------- audiod_command.c | 5 +- string.h | 6 +- 3 files changed, 47 insertions(+), 110 deletions(-) diff --git a/aft.c b/aft.c index 206be9e3..42153d46 100644 --- a/aft.c +++ b/aft.c @@ -748,62 +748,50 @@ static int write_attribute_items(struct para_buffer *b, char *att_text; int ret; - ret = WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_BITMAP, "%s\n", att_bitmap); - if (ret < 0) - return ret; + WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_BITMAP, "%s\n", att_bitmap); ret = get_attribute_text(&afsi->attributes, " ", &att_text); if (ret < 0) return ret; - ret = WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_TXT, "%s\n", att_text); + WRITE_STATUS_ITEM(b, SI_ATTRIBUTES_TXT, "%s\n", att_text); free(att_text); return ret; } -static int write_lyrics_items(struct para_buffer *b, struct afs_info *afsi) +static void write_lyrics_items(struct para_buffer *b, struct afs_info *afsi) { char *lyrics_name; - int ret; - ret = WRITE_STATUS_ITEM(b, SI_LYRICS_ID, "%u\n", afsi->lyrics_id); - if (ret < 0) - return ret; + WRITE_STATUS_ITEM(b, SI_LYRICS_ID, "%u\n", afsi->lyrics_id); lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name); - return WRITE_STATUS_ITEM(b, SI_LYRICS_NAME, "%s\n", lyrics_name? + WRITE_STATUS_ITEM(b, SI_LYRICS_NAME, "%s\n", lyrics_name? lyrics_name : "(none)"); } -static int write_image_items(struct para_buffer *b, struct afs_info *afsi) +static void write_image_items(struct para_buffer *b, struct afs_info *afsi) { char *image_name; - int ret; - ret = WRITE_STATUS_ITEM(b, SI_IMAGE_ID, "%u\n", afsi->image_id); - if (ret < 0) - return ret; + WRITE_STATUS_ITEM(b, SI_IMAGE_ID, "%u\n", afsi->image_id); img_get_name_by_id(afsi->image_id, &image_name); - return WRITE_STATUS_ITEM(b, SI_IMAGE_NAME, "%s\n", image_name? + WRITE_STATUS_ITEM(b, SI_IMAGE_NAME, "%s\n", image_name? image_name : "(none)"); } -static int write_filename_items(struct para_buffer *b, const char *path, +static void write_filename_items(struct para_buffer *b, const char *path, unsigned flags) { char *val; - int ret; - if (!(flags & LS_FLAG_FULL_PATH)) - return WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", path); - ret = WRITE_STATUS_ITEM(b, SI_PATH, "%s\n", path); - if (ret < 0) - return ret; + if (!(flags & LS_FLAG_FULL_PATH)) { + WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", path); + return; + } + WRITE_STATUS_ITEM(b, SI_PATH, "%s\n", path); val = para_basename(path); - ret = WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", val? val : ""); - if (ret < 0) - return ret; + WRITE_STATUS_ITEM(b, SI_BASENAME, "%s\n", val? val : ""); val = para_dirname(path); - ret = WRITE_STATUS_ITEM(b, SI_DIRECTORY, "%s\n", val? val : ""); + WRITE_STATUS_ITEM(b, SI_DIRECTORY, "%s\n", val? val : ""); free(val); - return ret; } static int print_chunk_table(struct ls_data *d, struct para_buffer *b) @@ -835,12 +823,12 @@ static int print_chunk_table(struct ls_data *d, struct para_buffer *b) return ret; } -static int write_score(struct para_buffer *b, struct ls_data *d, +static void write_score(struct para_buffer *b, struct ls_data *d, struct ls_options *opts) { if (!(opts->flags & LS_FLAG_ADMISSIBLE_ONLY)) /* no score*/ - return 0; - return WRITE_STATUS_ITEM(b, SI_SCORE, "%li\n", d->score); + return; + WRITE_STATUS_ITEM(b, SI_SCORE, "%li\n", d->score); } static int print_list_item(struct ls_data *d, struct ls_options *opts, @@ -919,80 +907,33 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts, last_played_time, bn? bn : "?"); } - ret = write_filename_items(b, d->path, opts->flags); - if (ret < 0) - goto out; - ret = write_score(b, d, opts); - if (ret < 0) - goto out; + write_filename_items(b, d->path, opts->flags); + write_score(b, d, opts); ret = write_attribute_items(b, att_buf, afsi); if (ret < 0) goto out; - ret = write_image_items(b, afsi); - if (ret < 0) - goto out; - ret = write_lyrics_items(b, afsi); - if (ret < 0) - goto out; + write_image_items(b, afsi); + write_lyrics_items(b, afsi); hash_to_asc(d->hash, asc_hash); - ret = WRITE_STATUS_ITEM(b, SI_HASH, "%s\n", asc_hash); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_BITRATE, "%dkbit/s\n", afhi->bitrate); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_FORMAT, "%s\n", + WRITE_STATUS_ITEM(b, SI_HASH, "%s\n", asc_hash); + WRITE_STATUS_ITEM(b, SI_BITRATE, "%dkbit/s\n", afhi->bitrate); + WRITE_STATUS_ITEM(b, SI_FORMAT, "%s\n", audio_format_name(afsi->audio_format_id)); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_FREQUENCY, "%dHz\n", afhi->frequency); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_CHANNELS, "%d\n", afhi->channels); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_DURATION, "%s\n", duration_buf); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_SECONDS_TOTAL, "%lu\n", - afhi->seconds_total); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_LAST_PLAYED, "%s\n", last_played_time); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_NUM_PLAYED, "%d\n", afsi->num_played); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_AMPLIFICATION, "%u\n", afsi->amp); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n", - tv2ms(&afhi->chunk_tv)); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%lu\n", - afhi->chunks_total); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_YEAR, "%s\n", afhi->tags.year); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_ALBUM, "%s\n", afhi->tags.album); - if (ret < 0) - goto out; - ret = WRITE_STATUS_ITEM(b, SI_COMMENT, "%s\n", afhi->tags.comment); - if (ret < 0) - goto out; + WRITE_STATUS_ITEM(b, SI_FREQUENCY, "%dHz\n", afhi->frequency); + WRITE_STATUS_ITEM(b, SI_CHANNELS, "%d\n", afhi->channels); + WRITE_STATUS_ITEM(b, SI_DURATION, "%s\n", duration_buf); + WRITE_STATUS_ITEM(b, SI_SECONDS_TOTAL, "%lu\n", afhi->seconds_total); + WRITE_STATUS_ITEM(b, SI_LAST_PLAYED, "%s\n", last_played_time); + WRITE_STATUS_ITEM(b, SI_NUM_PLAYED, "%d\n", afsi->num_played); + WRITE_STATUS_ITEM(b, SI_AMPLIFICATION, "%u\n", afsi->amp); + WRITE_STATUS_ITEM(b, SI_CHUNK_TIME, "%lu\n", tv2ms(&afhi->chunk_tv)); + WRITE_STATUS_ITEM(b, SI_NUM_CHUNKS, "%lu\n", afhi->chunks_total); + WRITE_STATUS_ITEM(b, SI_TECHINFO, "%s\n", afhi->techinfo); + WRITE_STATUS_ITEM(b, SI_ARTIST, "%s\n", afhi->tags.artist); + WRITE_STATUS_ITEM(b, SI_TITLE, "%s\n", afhi->tags.title); + WRITE_STATUS_ITEM(b, SI_YEAR, "%s\n", afhi->tags.year); + WRITE_STATUS_ITEM(b, SI_ALBUM, "%s\n", afhi->tags.album); + WRITE_STATUS_ITEM(b, SI_COMMENT, "%s\n", afhi->tags.comment); if (opts->mode == LS_MODE_MBOX) { struct osl_object lyrics_def; lyr_get_def_by_id(afsi->lyrics_id, &lyrics_def); @@ -1026,9 +967,8 @@ static void make_inode_status_items(struct para_buffer *pb) ret = strftime(mtime_str, 29, "%b %d %Y", &mtime_tm); assert(ret > 0); /* number of bytes placed in mtime_str */ out: - /* We don't care too much about errors here */ - (void)WRITE_STATUS_ITEM(pb, SI_MTIME, "%s\n", mtime_str); - (void)WRITE_STATUS_ITEM(pb, SI_FILE_SIZE, "%ld\n", statbuf.st_size / 1024); + WRITE_STATUS_ITEM(pb, SI_MTIME, "%s\n", mtime_str); + WRITE_STATUS_ITEM(pb, SI_FILE_SIZE, "%ld\n", statbuf.st_size / 1024); } static int make_status_items(void) diff --git a/audiod_command.c b/audiod_command.c index 8d80f0cb..294815e1 100644 --- a/audiod_command.c +++ b/audiod_command.c @@ -189,8 +189,7 @@ void stat_client_write_item(int item_num) continue; b = (sc->flags & SCF_PARSER_FRIENDLY)? &pfpb : &pb; if (!b->buf) - (void)WRITE_STATUS_ITEM(b, item_num, "%s\n", - msg? msg : ""); + WRITE_STATUS_ITEM(b, item_num, "%s\n", msg? msg : ""); ret = write(sc->fd, b->buf, b->offset); if (ret == b->offset) continue; @@ -337,7 +336,7 @@ static int com_stat(int fd, int argc, char **argv) char *item = stat_item_values[i]; if (!((one << i) & mask)) continue; - (void)WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : ""); + WRITE_STATUS_ITEM(&b, i, "%s\n", item? item : ""); } ret = client_write(fd, b.buf); if (ret >= 0) diff --git a/string.h b/string.h index f3e935e3..61bb7c25 100644 --- a/string.h +++ b/string.h @@ -62,14 +62,12 @@ int for_each_line(unsigned flags, char *buf, size_t size, */ #define WRITE_STATUS_ITEM(b, n, f, ...) (\ { \ - int _ret; \ if ((b)->flags & PBF_SIZE_PREFIX) { \ - _ret = para_printf((b), "%02x:" f, n, ## __VA_ARGS__); \ + para_printf((b), "%02x:" f, n, ## __VA_ARGS__); \ } else { \ - _ret = para_printf((b), "%s: " f, status_item_list[(n)], \ + para_printf((b), "%s: " f, status_item_list[(n)], \ ## __VA_ARGS__); \ } \ - _ret; \ } \ ) -- 2.39.5