nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not pass null to printf

Browse Source 
OpenBSD issues a warning using syslog whenever NULL is passed as a variadic
argument to the printf-like family of functions.
This commit is contained in:
Anton Lindqvist
2021-12-05 08:53:08 +01:00
parent 7693b4ae1b
commit 3b91065c2a
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shairport.c
+9 -7
View File
@@ -120,6 +120,8 @@ int this_is_the_daemon_process = 0;
#define UUID_STR_LEN 36
#endif
#define strnull(s) ((s) ? (s) : "(null)")
pthread_t rtsp_listener_thread;
int killOption = 0;
@@ -1976,15 +1978,15 @@ int main(int argc, char **argv) {
debug(1, "udp port range is %d.", config.udp_port_range);
debug(1, "player name is \"%s\".", config.service_name);
debug(1, "backend is \"%s\".", config.output_name);
debug(1, "run_this_before_play_begins action is \"%s\".", config.cmd_start);
debug(1, "run_this_after_play_ends action is \"%s\".", config.cmd_stop);
debug(1, "run_this_before_play_begins action is \"%s\".", strnull(config.cmd_start));
debug(1, "run_this_after_play_ends action is \"%s\".", strnull(config.cmd_stop));
debug(1, "wait-cmd status is %d.", config.cmd_blocking);
debug(1, "run_this_before_play_begins may return output is %d.", config.cmd_start_returns_output);
debug(1, "run_this_if_an_unfixable_error_is_detected action is \"%s\".", config.cmd_unfixable);
debug(1, "run_this_before_entering_active_state action is \"%s\".", config.cmd_active_start);
debug(1, "run_this_after_exiting_active_state action is \"%s\".", config.cmd_active_stop);
debug(1, "run_this_if_an_unfixable_error_is_detected action is \"%s\".", strnull(config.cmd_unfixable));
debug(1, "run_this_before_entering_active_state action is \"%s\".", strnull(config.cmd_active_start));
debug(1, "run_this_after_exiting_active_state action is \"%s\".", strnull(config.cmd_active_stop));
debug(1, "active_state_timeout is %f seconds.", config.active_state_timeout);
debug(1, "mdns backend \"%s\".", config.mdns_name);
debug(1, "mdns backend \"%s\".", strnull(config.mdns_name));
debug(2, "userSuppliedLatency is %d.", config.userSuppliedLatency);
debug(1, "interpolation setting is \"%s\".",
config.packet_stuffing == ST_basic ? "basic"
@@ -1995,7 +1997,7 @@ int main(int argc, char **argv) {
debug(1, "allow a session to be interrupted: %d.", config.allow_session_interruption);
debug(1, "busy timeout time is %d.", config.timeout);
debug(1, "drift tolerance is %f seconds.", config.tolerance);
debug(1, "password is \"%s\".", config.password);
debug(1, "password is \"%s\".", strnull(config.password));
debug(1, "ignore_volume_control is %d.", config.ignore_volume_control);
if (config.volume_max_db_set)
debug(1, "volume_max_db is %d.", config.volume_max_db);