aniani/ezstream
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/ezstream.git synced 2024-11-03 04:17:18 -05:00
Code

Style improvements

Browse Source
This commit is contained in:
Moritz Grimm 2018-01-23 11:10:04 +01:00
parent 20c7bd64b1
commit 75a9a410aa
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ezconfig0.c
View File

@ -612,8 +612,6 @@ parseConfig(const char *fileName)
void void
freeConfig(EZCONFIG *cfg) freeConfig(EZCONFIG *cfg)
{ {
unsigned int i;
if (cfg == NULL) if (cfg == NULL)
return; return;
@ -646,6 +644,8 @@ freeConfig(EZCONFIG *cfg)
if (cfg->serverQuality != NULL) if (cfg->serverQuality != NULL)
free(cfg->serverQuality); free(cfg->serverQuality);
if (cfg->encoderDecoders != NULL) { if (cfg->encoderDecoders != NULL) {
unsigned int i;
for (i = 0; i < MAX_FORMAT_ENCDEC; i++) { for (i = 0; i < MAX_FORMAT_ENCDEC; i++) {
if (cfg->encoderDecoders[i] != NULL) { if (cfg->encoderDecoders[i] != NULL) {
if (cfg->encoderDecoders[i]->format != NULL) if (cfg->encoderDecoders[i]->format != NULL)

2
src/ezstream-cfgmigrate.c
View File

@ -309,7 +309,7 @@ _parse_ezconfig0(EZCONFIG *ez)
} else { } else {
if (ed->format && if (ed->format &&
0 == strcasecmp(ed->format, "THEORA")) { 0 == strcasecmp(ed->format, "THEORA")) {
cfg_encoder_t enc = NULL; cfg_encoder_t enc;
enc = cfg_encoder_list_find(enc_list, enc = cfg_encoder_list_find(enc_list,
ed->format); ed->format);

3
src/ezstream.c
View File

@ -101,7 +101,6 @@ _build_reencode_cmd(const char *extension, const char *filename,
char *custom_songinfo; char *custom_songinfo;
struct util_dict dicts[6]; struct util_dict dicts[6];
char *dec_str; char *dec_str;
char *enc_str;
char *cmd_str; char *cmd_str;
size_t cmd_str_size; 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); dec_str = util_expand_words(cfg_decoder_get_program(decoder), dicts);
cmd_str_size = strlen(dec_str) + 1; cmd_str_size = strlen(dec_str) + 1;
if (cfg_encoder_get_program(encoder)) { if (cfg_encoder_get_program(encoder)) {
char *enc_str;
enc_str = util_expand_words(cfg_encoder_get_program(encoder), enc_str = util_expand_words(cfg_encoder_get_program(encoder),
dicts); dicts);
cmd_str_size += strlen(" | ") + strlen(enc_str); cmd_str_size += strlen(" | ") + strlen(enc_str);