diff options
| author | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2022-01-06 07:46:38 +0000 |
| commit | b8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (patch) | |
| tree | 336d653df8387b9b1d3c6e46caa373c00cb9b2b2 /sysklogd | |
| parent | b15f68214da209b5b293039c09c00f490c0cc193 (diff) | |
| parent | 6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (diff) | |
| download | busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.gz busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.bz2 busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.zip | |
Merge busybox into merge
Fix merge conflict in miscutils/less.c.
Use exit_SUCCESS() where possible.
Diffstat (limited to 'sysklogd')
| -rw-r--r-- | sysklogd/logread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysklogd/logread.c b/sysklogd/logread.c index d5f8ca0a2..e6cfcf4a7 100644 --- a/sysklogd/logread.c +++ b/sysklogd/logread.c | |||
| @@ -226,5 +226,5 @@ int logread_main(int argc UNUSED_PARAM, char **argv) | |||
| 226 | 226 | ||
| 227 | /* shmdt(shbuf); - on Linux, shmdt is not mandatory on exit */ | 227 | /* shmdt(shbuf); - on Linux, shmdt is not mandatory on exit */ |
| 228 | 228 | ||
| 229 | fflush_stdout_and_exit(EXIT_SUCCESS); | 229 | fflush_stdout_and_exit_SUCCESS(); |
| 230 | } | 230 | } |