From 5059653882dbd86e3bbf48389f9f81b0fac8cd0a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 17 Mar 2019 19:47:52 +0100 Subject: do not duplicate CONFIG_PID_FILE_PATH and ".pid" strings text data bss dec hex filename 981737 485 7296 989518 f194e busybox_old 981704 485 7296 989485 f192d busybox_unstripped Signed-off-by: Denys Vlasenko --- miscutils/crond.c | 2 +- miscutils/watchdog.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'miscutils') diff --git a/miscutils/crond.c b/miscutils/crond.c index 2e36c406b..25e5503c7 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c @@ -1056,7 +1056,7 @@ int crond_main(int argc UNUSED_PARAM, char **argv) log8("crond (busybox "BB_VER") started, log level %d", G.log_level); rescan_crontab_dir(); - write_pidfile(CONFIG_PID_FILE_PATH "/crond.pid"); + write_pidfile_std_path_and_ext("crond"); #if ENABLE_FEATURE_CROND_SPECIAL_TIMES if (touch_reboot_file()) start_jobs(START_ME_REBOOT); /* start @reboot entries, if any */ diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c index 1e9ecc5e8..86600b72f 100644 --- a/miscutils/watchdog.c +++ b/miscutils/watchdog.c @@ -64,7 +64,7 @@ static void shutdown_watchdog(void) static void shutdown_on_signal(int sig UNUSED_PARAM) { - remove_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid"); + remove_pidfile_std_path_and_ext("watchdog"); shutdown_watchdog(); _exit(EXIT_SUCCESS); } @@ -136,7 +136,7 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv) stimer_duration, htimer_duration * 1000); #endif - write_pidfile(CONFIG_PID_FILE_PATH "/watchdog.pid"); + write_pidfile_std_path_and_ext("watchdog"); while (1) { /* -- cgit v1.2.3