From 75a9a410aa59d55b69050107833b9f29467f8d8c Mon Sep 17 00:00:00 2001 From: Moritz Grimm Date: Tue, 23 Jan 2018 11:10:04 +0100 Subject: [PATCH] Style improvements --- src/ezconfig0.c | 4 ++-- src/ezstream-cfgmigrate.c | 2 +- src/ezstream.c | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ezconfig0.c b/src/ezconfig0.c index 335d4c3..2e4f599 100644 --- a/src/ezconfig0.c +++ b/src/ezconfig0.c @@ -612,8 +612,6 @@ parseConfig(const char *fileName) void freeConfig(EZCONFIG *cfg) { - unsigned int i; - if (cfg == NULL) return; @@ -646,6 +644,8 @@ freeConfig(EZCONFIG *cfg) if (cfg->serverQuality != NULL) free(cfg->serverQuality); if (cfg->encoderDecoders != NULL) { + unsigned int i; + for (i = 0; i < MAX_FORMAT_ENCDEC; i++) { if (cfg->encoderDecoders[i] != NULL) { if (cfg->encoderDecoders[i]->format != NULL) diff --git a/src/ezstream-cfgmigrate.c b/src/ezstream-cfgmigrate.c index d1ef7bc..4ec4fa1 100644 --- a/src/ezstream-cfgmigrate.c +++ b/src/ezstream-cfgmigrate.c @@ -309,7 +309,7 @@ _parse_ezconfig0(EZCONFIG *ez) } else { if (ed->format && 0 == strcasecmp(ed->format, "THEORA")) { - cfg_encoder_t enc = NULL; + cfg_encoder_t enc; enc = cfg_encoder_list_find(enc_list, ed->format); diff --git a/src/ezstream.c b/src/ezstream.c index 66b0e9e..dec8010 100644 --- a/src/ezstream.c +++ b/src/ezstream.c @@ -101,7 +101,6 @@ _build_reencode_cmd(const char *extension, const char *filename, char *custom_songinfo; struct util_dict dicts[6]; char *dec_str; - char *enc_str; char *cmd_str; size_t cmd_str_size; @@ -189,6 +188,8 @@ _build_reencode_cmd(const char *extension, const char *filename, dec_str = util_expand_words(cfg_decoder_get_program(decoder), dicts); cmd_str_size = strlen(dec_str) + 1; if (cfg_encoder_get_program(encoder)) { + char *enc_str; + enc_str = util_expand_words(cfg_encoder_get_program(encoder), dicts); cmd_str_size += strlen(" | ") + strlen(enc_str);