diff options
| author |   joris <joris@openbsd.org> | 2008-06-11 01:55:05 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2008-06-11 01:55:05 +0000 |
| commit | 7c650248f0710b52d507b48e32477efd2d3209e5 (patch) | |
| tree | c118c34cead1b0697297ba3905210965d790bd0c | |
| parent | ofd is being closed in cvs_file_free(), no need to close it ourselfs (diff) | |
| download | wireguard-openbsd-7c650248f0710b52d507b48e32477efd2d3209e5.tar.xz wireguard-openbsd-7c650248f0710b52d507b48e32477efd2d3209e5.zip | |
style ferry comes around
| -rw-r--r-- | usr.bin/cvs/log.c | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c index f83a06b50e6..30b757c8318 100644 --- a/usr.bin/cvs/log.c +++ b/usr.bin/cvs/log.c @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.43 2008/04/24 19:13:56 tobias Exp $ */ +/* $OpenBSD: log.c,v 1.44 2008/06/11 01:55:05 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -129,36 +129,38 @@ cvs_printf(const char *fmt, ...) va_start(vap, fmt); - ret = vasprintf(&nstr, fmt, vap); - if (ret == -1) - fatal("cvs_printf: could not allocate memory"); - for (dp = nstr; *dp != '\0';) { - sp = strchr(dp, '\n'); - if (sp == NULL) - for (sp = dp; *sp != '\0'; sp++) - ; - - if (cvs_server_active && send_m) { - send_m = 0; - putc('M', stdout); - putc(' ', stdout); - } - - if (dp != nstr && dp != sp && - !strncmp(dp, LOG_REVSEP, sp - dp)) - putc('>', stdout); - - fwrite(dp, sizeof(char), (size_t)(sp - dp), stdout); - - if (*sp != '\n') - break; - - putc('\n', stdout); - send_m = 1; - dp = sp + 1; + ret = vasprintf(&nstr, fmt, vap); + if (ret == -1) + fatal("cvs_printf: could not allocate memory"); + + for (dp = nstr; *dp != '\0';) { + sp = strchr(dp, '\n'); + if (sp == NULL) + for (sp = dp; *sp != '\0'; sp++) + ; + + if (cvs_server_active && send_m) { + send_m = 0; + putc('M', stdout); + putc(' ', stdout); } - xfree(nstr); + if (dp != nstr && dp != sp && + !strncmp(dp, LOG_REVSEP, sp - dp)) + putc('>', stdout); + + fwrite(dp, sizeof(char), (size_t)(sp - dp), stdout); + + if (*sp != '\n') + break; + + putc('\n', stdout); + send_m = 1; + dp = sp + 1; + } + + xfree(nstr); va_end(vap); + return (ret); } |