diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-03-25 15:06:59 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2016-03-25 15:06:59 +0000 |
| commit | c811b954860c4c84af5cc99ea22d89bcbee7421e (patch) | |
| tree | af06c1bf9d0185418e08abc00232375581478554 /usr.sbin/smtpd/smtpd.h | |
| parent | db191d55659dd9dc19b2e3d13b370e62e0cd1c46 (diff) | |
Nuke session_socket_blockmode() and session_socket_linger(). Use
the identical io_set_blocking() and io_set_linger().
Since both are always called to turn off blocking or lingering,
nuke the parameter and associated enum in favour of "just doing the
right thing".
While passing remove the unneeded last parameter to the remaining
fcntl(F_GETFL).
Finally, rename the functions to io_set_nonblocking() and
io_set_nolinger() for clarity.
No functional change.
Started with a sweep of fcntl() usage inspired by guenther@.
ok gilles@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 783f96f8111..994e630fd84 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.513 2016/02/21 15:17:25 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.514 2016/03/25 15:06:58 krw Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -308,11 +308,6 @@ enum imsg_type { IMSG_CA_PRIVDEC }; -enum blockmodes { - BM_NORMAL, - BM_NONBLOCK -}; - enum smtp_proc_type { PROC_PARENT = 0, PROC_LKA, @@ -1506,8 +1501,6 @@ void iobuf_xinit(struct iobuf *, size_t, size_t, const char *); void iobuf_xfqueue(struct iobuf *, const char *, const char *, ...); void log_envelope(const struct envelope *, const char *, const char *, const char *); -void session_socket_blockmode(int, enum blockmodes); -void session_socket_no_linger(int); int session_socket_error(int); int getmailname(char *, size_t); int base64_encode(unsigned char const *, size_t, char *, size_t); |