diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | misc.c | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -11,6 +11,9 @@ | |||
11 | - deraadt@cvs.openbsd.org 2002/02/26 19:06:43 | 11 | - deraadt@cvs.openbsd.org 2002/02/26 19:06:43 |
12 | [sftp.1] | 12 | [sftp.1] |
13 | no, look closely. the comma was highlighted. split .Ic even more | 13 | no, look closely. the comma was highlighted. split .Ic even more |
14 | - stevesk@cvs.openbsd.org 2002/02/26 20:03:51 | ||
15 | [misc.c] | ||
16 | use socklen_t | ||
14 | 17 | ||
15 | 20020226 | 18 | 20020226 |
16 | - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests | 19 | - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests |
@@ -7742,4 +7745,4 @@ | |||
7742 | - Wrote replacements for strlcpy and mkdtemp | 7745 | - Wrote replacements for strlcpy and mkdtemp |
7743 | - Released 1.0pre1 | 7746 | - Released 1.0pre1 |
7744 | 7747 | ||
7745 | $Id: ChangeLog,v 1.1893 2002/03/05 01:26:38 mouring Exp $ | 7748 | $Id: ChangeLog,v 1.1894 2002/03/05 01:28:14 mouring Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.16 2002/02/24 19:59:42 stevesk Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.17 2002/02/26 20:03:51 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: misc.c,v 1.16 2002/02/24 19:59:42 stevesk Exp $"); | 28 | RCSID("$OpenBSD: misc.c,v 1.17 2002/02/26 20:03:51 stevesk Exp $"); |
29 | 29 | ||
30 | #include "misc.h" | 30 | #include "misc.h" |
31 | #include "log.h" | 31 | #include "log.h" |
@@ -96,7 +96,8 @@ unset_nonblock(int fd) | |||
96 | void | 96 | void |
97 | set_nodelay(int fd) | 97 | set_nodelay(int fd) |
98 | { | 98 | { |
99 | int opt, optlen; | 99 | int opt; |
100 | socklen_t optlen; | ||
100 | 101 | ||
101 | optlen = sizeof opt; | 102 | optlen = sizeof opt; |
102 | if (getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen) == -1) { | 103 | if (getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen) == -1) { |