diff options
author | des <des@FreeBSD.org> | 2014-04-12 20:22:59 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2014-04-12 20:22:59 +0000 |
commit | faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5 (patch) | |
tree | 1869bb83deee7739b988ace790deca83cd513254 /crypto/openssh/openbsd-compat/bsd-poll.c | |
parent | 0918f176a2a27c20190030f7d90050e0b1a8e25c (diff) | |
download | FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.zip FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.tar.gz |
MFH (r263712): upgrade openssh to 6.6p1
MFH (r264308): restore p level in debugging output
Diffstat (limited to 'crypto/openssh/openbsd-compat/bsd-poll.c')
-rw-r--r-- | crypto/openssh/openbsd-compat/bsd-poll.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/openssh/openbsd-compat/bsd-poll.c b/crypto/openssh/openbsd-compat/bsd-poll.c index c7ef827..73a8524 100644 --- a/crypto/openssh/openbsd-compat/bsd-poll.c +++ b/crypto/openssh/openbsd-compat/bsd-poll.c @@ -1,4 +1,4 @@ -/* $Id: bsd-poll.c,v 1.5 2013/11/08 10:12:58 dtucker Exp $ */ +/* $Id: bsd-poll.c,v 1.6 2014/02/05 23:44:13 dtucker Exp $ */ /* * Copyright (c) 2004, 2005, 2007 Darren Tucker (dtucker at zip com au). @@ -109,12 +109,9 @@ poll(struct pollfd *fds, nfds_t nfds, int timeout) } out: - if (readfds != NULL) - free(readfds); - if (writefds != NULL) - free(writefds); - if (exceptfds != NULL) - free(exceptfds); + free(readfds); + free(writefds); + free(exceptfds); if (ret == -1) errno = saved_errno; return ret; |