summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authormouring <mouring>2002-03-05 01:48:09 +0000
committermouring <mouring>2002-03-05 01:48:09 +0000
commitf3e401d676d9dd4b34c8c9b7bd19b7eff455cd68 (patch)
tree97449f0c775adfda421522de5f9c20e2ab92427f /misc.c
parent76d07e69c2e4ed7e19da769eae056a257c0e43bd (diff)
downloadopenssh-f3e401d676d9dd4b34c8c9b7bd19b7eff455cd68.tar.gz
- markus@cvs.openbsd.org 2002/03/04 13:10:46
[misc.c] error-> debug, because O_NONBLOCK for /dev/null causes too many different errnos; ok stevesk@, deraadt@ unused include
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/misc.c b/misc.c
index 46cc4319..9e5a5aba 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.17 2002/02/26 20:03:51 stevesk Exp $ */
+/* $OpenBSD: misc.c,v 1.18 2002/03/04 13:10:46 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.17 2002/02/26 20:03:51 stevesk Exp $");
+RCSID("$OpenBSD: misc.c,v 1.18 2002/03/04 13:10:46 markus Exp $");
#include "misc.h"
#include "log.h"
@@ -65,9 +65,8 @@ set_nonblock(int fd)
debug("fd %d setting O_NONBLOCK", fd);
val |= O_NONBLOCK;
if (fcntl(fd, F_SETFL, val) == -1)
- if (errno != ENODEV)
- error("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
- fd, strerror(errno));
+ debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
+ fd, strerror(errno));
}
void
@@ -87,9 +86,8 @@ unset_nonblock(int fd)
debug("fd %d clearing O_NONBLOCK", fd);
val &= ~O_NONBLOCK;
if (fcntl(fd, F_SETFL, val) == -1)
- if (errno != ENODEV)
- error("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
- fd, strerror(errno));
+ debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s",
+ fd, strerror(errno));
}
/* disable nagle on socket */