summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/msg.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-12-06 21:03:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-12-06 21:03:14 +0000
commitff9bafeb0d201ee9eff719dedd6a13b355b27931 (patch)
tree3a91fdf291b4ec44c6472eaa2edc48adfda4ed92 /usr.bin/cvs/msg.c
parent06cd0b351bf2244fbb9c05110c01487916237fcc (diff)
tighten vertical spacing for else; jfb ok
Diffstat (limited to 'usr.bin/cvs/msg.c')
-rw-r--r--usr.bin/cvs/msg.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/cvs/msg.c b/usr.bin/cvs/msg.c
index 620f1fbefb1..2134b394032 100644
--- a/usr.bin/cvs/msg.c
+++ b/usr.bin/cvs/msg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msg.c,v 1.4 2004/09/27 17:11:07 jfb Exp $ */
+/* $OpenBSD: msg.c,v 1.5 2004/12/06 21:03:12 deraadt Exp $ */
/*
* Copyright (c) 2002 Matthieu Herrb
* Copyright (c) 2001 Niels Provos <provos@citi.umich.edu>
@@ -154,8 +154,7 @@ cvsd_sendmsg(int fd, u_int type, const void *data, size_t len)
iov[1].iov_base = (void *)data;
iov[1].iov_len = len;
cnt = 2;
- }
- else
+ } else
msg.cm_len = sizeof(int); /* dummy */
if (writev(fd, iov, cnt) == -1) {
@@ -193,8 +192,7 @@ cvsd_recvmsg(int fd, u_int *type, void *dst, size_t *len)
if ((ret = read(fd, &msg, sizeof(msg))) == -1) {
cvs_log(LP_ERRNO, "failed to read message header");
return (-1);
- }
- else if (ret == 0)
+ } else if (ret == 0)
return (0);
if (*len < msg.cm_len) {
@@ -209,14 +207,12 @@ cvsd_recvmsg(int fd, u_int *type, void *dst, size_t *len)
*(int *)dst = sfd;
*len = sizeof(sfd);
- }
- else {
+ } else {
ret = read(fd, dst, msg.cm_len);
if (ret == -1) {
cvs_log(LP_ERRNO, "failed to read message");
return (-1);
- }
- else if (ret == 0) {
+ } else if (ret == 0) {
}
*len = (size_t)ret;