X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=6aa7c1f4c597fd92d4574aa43f3742604e6c9df9;hp=915687649f7f84c8a572b2257a7439498d31c873;hb=a584fc87a0e2ab02168fe63a5571f0b5b48698c2;hpb=b27aade3555464d1ab75f458f09c048bc938aae0 diff --git a/server.c b/server.c index 91568764..6aa7c1f4 100644 --- a/server.c +++ b/server.c @@ -23,8 +23,8 @@ * The gory details, listed by topic: * * - Audio format handlers: \ref send_common.c \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c, - * - Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c, - * - Volume normalizer: \ref compress.c, + * - Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c, \ref aacdec_filter.c, + * - Volume normalizer: \ref compress_filter.c, * - Output: \ref alsa_write.c, \ref osx_write.c, * - http: \ref http_recv.c, \ref http_send.c, * - ortp: \ref ortp_recv.c, \ref ortp_send.c, @@ -136,7 +136,7 @@ struct server_command_task { * \param ll The log level. * \param fmt The format string describing the log message. */ -void para_log(int ll, const char* fmt,...) +__printf_2_3 void para_log(int ll, const char* fmt,...) { va_list argp; FILE *outfd; @@ -226,7 +226,7 @@ static void parse_config(int override) .initialize = 0, .check_required = 1, .check_ambiguity = 0, - .print_errors = 1 + .print_errors = !conf.daemon_given }; server_cmdline_parser_config_file(cf, &conf, ¶ms); conf.daemon_given = tmp;