From 915b941729895fe4f6f71528564606eeb1d13a8f Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sat, 22 Jun 2002 20:47:26 +0000 Subject: Sunil's code-duplication cleanup patch. svn path=/trunk/; revision=3651 --- socket.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'socket.c') diff --git a/socket.c b/socket.c index 4c32898f..f1bea9f6 100644 --- a/socket.c +++ b/socket.c @@ -525,10 +525,8 @@ int SockWrite(int sock, char *buf, int len) if( NULL != ( ssl = SSLGetContext( sock ) ) ) n = SSL_write(ssl, buf, len); else - n = fm_write(sock, buf, len); -#else - n = fm_write(sock, buf, len); -#endif +#endif /* SSL_ENABLE */ + n = fm_write(sock, buf, len); if (n <= 0) return -1; len -= n; @@ -676,14 +674,10 @@ int SockPeek(int sock) return 0; /* Give him a '\0' character */ } - } else { - n = fm_peek(sock, &ch, 1); } -#else - - n = fm_peek(sock, &ch, 1); - + else #endif /* SSL_ENABLE */ + n = fm_peek(sock, &ch, 1); if (n == -1) return -1; -- cgit v1.2.3