summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-03-05 01:28:14 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-03-05 01:28:14 +0000
commite86de51afb891a21b9d5c0a3596b946741876c55 (patch)
tree4284766059b1ad364bde134d0da54e09fbfeb52b
parent3612bda7fde36d4b5c343ba852d9a627989b7857 (diff)
- stevesk@cvs.openbsd.org 2002/02/26 20:03:51
[misc.c] use socklen_t
-rw-r--r--ChangeLog5
-rw-r--r--misc.c7
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ea684997..458b82f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
- deraadt@cvs.openbsd.org 2002/02/26 19:06:43
[sftp.1]
no, look closely. the comma was highlighted. split .Ic even more
+ - stevesk@cvs.openbsd.org 2002/02/26 20:03:51
+ [misc.c]
+ use socklen_t
20020226
- (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests
@@ -7742,4 +7745,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1893 2002/03/05 01:26:38 mouring Exp $
+$Id: ChangeLog,v 1.1894 2002/03/05 01:28:14 mouring Exp $
diff --git a/misc.c b/misc.c
index d34423f6..46cc4319 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.16 2002/02/24 19:59:42 stevesk Exp $ */
+/* $OpenBSD: misc.c,v 1.17 2002/02/26 20:03:51 stevesk Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.16 2002/02/24 19:59:42 stevesk Exp $");
+RCSID("$OpenBSD: misc.c,v 1.17 2002/02/26 20:03:51 stevesk Exp $");
#include "misc.h"
#include "log.h"
@@ -96,7 +96,8 @@ unset_nonblock(int fd)
void
set_nodelay(int fd)
{
- int opt, optlen;
+ int opt;
+ socklen_t optlen;
optlen = sizeof opt;
if (getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen) == -1) {