d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon: change type of listen_child() to C99 bool

Browse Source 
Reviewed by:	kevans
Pull Request:	https://github.com/freebsd/freebsd-src/pull/672
This commit is contained in:
Ihor Antonov 2023-03-02 23:17:02 -06:00 committed by Kyle Evans
parent 75f61ca920
commit bc43a9a715
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
usr.sbin/daemon/daemon.c
View File

@ -73,9 +73,9 @@ static void restrict_process(const char *);
static void handle_term(int); static void handle_term(int);
static void handle_chld(int); static void handle_chld(int);
static void handle_hup(int); static void handle_hup(int);
static int open_log(const char *); static int open_log(const char *);
static void reopen_log(struct log_params *); static void reopen_log(struct log_params *);
static int listen_child(int, struct log_params *); static bool listen_child(int, struct log_params *);
static int get_log_mapping(const char *, const CODE *); static int get_log_mapping(const char *, const CODE *);
static void open_pid_files(const char *, const char *, struct pidfh **, static void open_pid_files(const char *, const char *, struct pidfh **,
struct pidfh **); struct pidfh **);
@ -146,13 +146,13 @@ main(int argc, char *argv[])
{ {
bool supervision_enabled = false; bool supervision_enabled = false;
bool log_reopen = false; bool log_reopen = false;
bool child_eof = false;
char *p = NULL; char *p = NULL;
const char *child_pidfile = NULL; const char *child_pidfile = NULL;
const char *parent_pidfile = NULL; const char *parent_pidfile = NULL;
const char *title = NULL; const char *title = NULL;
const char *user = NULL; const char *user = NULL;
int ch = 0; int ch = 0;
int child_eof = 0;
int keep_cur_workdir = 1; int keep_cur_workdir = 1;
int pfd[2] = { -1, -1 }; int pfd[2] = { -1, -1 };
int restart = 0; int restart = 0;
@ -580,10 +580,10 @@ restrict_process(const char *user)
* We try to collect whole lines terminated by '\n'. Otherwise we collect a * We try to collect whole lines terminated by '\n'. Otherwise we collect a
* full buffer, and then output it. * full buffer, and then output it.
* *
* Return value of 0 is assumed to mean EOF or error, and 1 indicates to * Return value of false is assumed to mean EOF or error, and true indicates to
* continue reading. * continue reading.
*/ */
static int static bool
listen_child(int fd, struct log_params *logpar) listen_child(int fd, struct log_params *logpar)
{ {
static unsigned char buf[LBUF_SIZE]; static unsigned char buf[LBUF_SIZE];
@ -617,18 +617,18 @@ listen_child(int fd, struct log_params *logpar)
} }
/* Wait until the buffer is full. */ /* Wait until the buffer is full. */
if (bytes_read < LBUF_SIZE - 1) { if (bytes_read < LBUF_SIZE - 1) {
return 1; return true;
} }
do_output(buf, bytes_read, logpar); do_output(buf, bytes_read, logpar);
bytes_read = 0; bytes_read = 0;
return 1; return true;
} else if (rv == -1) { } else if (rv == -1) {
/* EINTR should trigger another read. */ /* EINTR should trigger another read. */
if (errno == EINTR) { if (errno == EINTR) {
return 1; return true;
} else { } else {
warn("read"); warn("read");
return 0; return false;
} }
} }
/* Upon EOF, we have to flush what's left of the buffer. */ /* Upon EOF, we have to flush what's left of the buffer. */
@ -636,7 +636,7 @@ listen_child(int fd, struct log_params *logpar)
do_output(buf, bytes_read, logpar); do_output(buf, bytes_read, logpar);
bytes_read = 0; bytes_read = 0;
} }
return 0; return false;
} }
/* /*