diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2010-07-16 17:53:21 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2010-07-16 17:53:21 +0000 |
| commit | ea9d9e199d3eb6ec93b03e81cbb2d3357249aa95 (patch) | |
| tree | c3522b6bceba4120805b32d4b343cb0b95ac59b4 /usr.bin/cvs | |
| parent | 71234d1d650c473c4c329fe9141fd838b7390f31 (diff) | |
Combine two diff_output lines into one, from diff.
OK stsp xsa nicm
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/diff_internals.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/usr.bin/cvs/diff_internals.c b/usr.bin/cvs/diff_internals.c index aa072bfb5e2..40e4d744213 100644 --- a/usr.bin/cvs/diff_internals.c +++ b/usr.bin/cvs/diff_internals.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff_internals.c,v 1.30 2010/07/15 18:23:50 ray Exp $ */ +/* $OpenBSD: diff_internals.c,v 1.31 2010/07/16 17:53:20 ray Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -1278,10 +1278,8 @@ dump_context_vec(FILE *f1, FILE *f2, int flags) diff_output("***************"); if ((flags & D_PROTOTYPE)) { f = match_function(ixold, lowa-1, f1); - if (f != NULL) { - diff_output(" "); - diff_output("%s", f); - } + if (f != NULL) + diff_output(" %s", f); } diff_output("\n*** "); range(lowa, upb, ","); @@ -1387,10 +1385,8 @@ dump_unified_vec(FILE *f1, FILE *f2, int flags) diff_output(" @@"); if ((flags & D_PROTOTYPE)) { f = match_function(ixold, lowa-1, f1); - if (f != NULL) { - diff_output(" "); - diff_output("%s", f); - } + if (f != NULL) + diff_output(" %s", f); } diff_output("\n"); |