diff options
| author |   deraadt <deraadt@openbsd.org> | 2006-03-08 05:01:50 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2006-03-08 05:01:50 +0000 |
| commit | ea53dac211a40eeb1178e8783f10ffcd6572d2e7 (patch) | |
| tree | 1ae18cdb8c07ab180f737178df207ceed5563d76 | |
| parent | KNF. (diff) | |
| download | wireguard-openbsd-ea53dac211a40eeb1178e8783f10ffcd6572d2e7.tar.xz wireguard-openbsd-ea53dac211a40eeb1178e8783f10ffcd6572d2e7.zip | |
spacing
| -rw-r--r-- | usr.bin/cvs/rcs.c | 8 | ||||
| -rw-r--r-- | usr.bin/cvs/tag.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index 9eb9f420e10..2a3a8844857 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.137 2006/03/07 19:17:57 joris Exp $ */ +/* $OpenBSD: rcs.c,v 1.138 2006/03/08 05:01:50 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -1111,7 +1111,7 @@ rcs_patch_lines(struct cvs_lines *dlines, struct cvs_lines *plines) dlp = TAILQ_PREV(dlp, cvs_tqh, l_list); } else if (dlp->l_lineno < lineno) { if (((ndlp = TAILQ_NEXT(dlp, l_list)) == NULL) || - (ndlp->l_lineno > lineno)) + (ndlp->l_lineno > lineno)) break; dlp = ndlp; } @@ -2731,7 +2731,7 @@ rcs_expand_keywords(char *rcsfile, struct rcs_delta *rdp, char *data, /* end the expansion */ if (mode & RCS_KWEXP_NAME) strlcat(expbuf, "$", sizeof(expbuf)); - + sizdiff = strlen(expbuf) - (end - start); tbuf = xmalloc(strlen(end) + 1); strlcpy(tbuf, end, strlen(end) + 1); @@ -2921,7 +2921,7 @@ rcs_kwexp_buf(BUF *bp, RCSFILE *rf, RCSNUM *rev) expanded = rcs_expand_keywords(rf->rf_path, rdp, tbuf, len, expmode); bp = cvs_buf_alloc(len, BUF_AUTOEXT); - cvs_buf_set(bp, expanded, strlen(expanded), 0); + cvs_buf_set(bp, expanded, strlen(expanded), 0); xfree(expanded); } return (bp); diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c index cb57d420fa7..db4a3b01180 100644 --- a/usr.bin/cvs/tag.c +++ b/usr.bin/cvs/tag.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tag.c,v 1.40 2006/02/06 08:33:03 xsa Exp $ */ +/* $OpenBSD: tag.c,v 1.41 2006/03/08 05:01:50 deraadt Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2004 Joris Vink <joris@openbsd.org> @@ -143,7 +143,7 @@ cvs_tag_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg) if ((runflags & TAG_BRANCH) && (runflags & TAG_DELETE)) { cvs_log(LP_WARN, "ignoring -b with -d options"); - runflags &= ~TAG_BRANCH; + runflags &= ~TAG_BRANCH; } if ((runflags & TAG_DELETE) && (tag_oldname != NULL)) |