summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/cvs/checkout.c6
-rw-r--r--usr.bin/cvs/cmd.c5
-rw-r--r--usr.bin/cvs/diff3.c13
-rw-r--r--usr.bin/cvs/proto.c7
-rw-r--r--usr.bin/cvs/rcs.c10
-rw-r--r--usr.bin/cvs/rcsnum.c20
-rw-r--r--usr.bin/cvs/xmalloc.c8
7 files changed, 38 insertions, 31 deletions
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c
index c52968e25d4..bc24ea5a57f 100644
--- a/usr.bin/cvs/checkout.c
+++ b/usr.bin/cvs/checkout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checkout.c,v 1.42 2005/12/30 02:03:28 joris Exp $ */
+/* $OpenBSD: checkout.c,v 1.43 2005/12/30 17:51:01 reyk Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -237,8 +237,8 @@ cvs_checkout_pre_exec(struct cvsroot *root)
snprintf(repo, sizeof(repo), "%s/%s", root->cr_dir,
co_mods[i]);
currepo = co_mods[i];
- ret = cvs_file_get(repo, CF_RECURSE | CF_REPO | CF_IGNORE,
- cvs_checkout_local, NULL, NULL);
+ ret = cvs_file_get(repo, CF_RECURSE | CF_REPO |
+ CF_IGNORE, cvs_checkout_local, NULL, NULL);
if (ret != CVS_EX_OK) {
closedir(dirp);
return (ret);
diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c
index b3d1d5b742c..3146af9dc41 100644
--- a/usr.bin/cvs/cmd.c
+++ b/usr.bin/cvs/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.40 2005/12/30 02:03:28 joris Exp $ */
+/* $OpenBSD: cmd.c,v 1.41 2005/12/30 17:51:01 reyk Exp $ */
/*
* Copyright (c) 2005 Joris Vink <joris@openbsd.org>
* All rights reserved.
@@ -179,7 +179,8 @@ cvs_startcmd(struct cvs_cmd *cmd, int argc, char **argv)
* We are not checking for CVS/Root since we fetched the root
* above via cvsroot_get().
*
- * checkout, export, import, init and release do not depend on these files.
+ * checkout, export, import, init and release do not depend on
+ * these files.
*/
error = 0;
if ((cmd->cmd_op != CVS_OP_CHECKOUT) &&
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c
index 3800ed09d6f..55e755a8525 100644
--- a/usr.bin/cvs/diff3.c
+++ b/usr.bin/cvs/diff3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3.c,v 1.10 2005/12/24 04:10:51 joris Exp $ */
+/* $OpenBSD: diff3.c,v 1.11 2005/12/30 17:51:01 reyk Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -71,7 +71,8 @@ static const char copyright[] =
#endif /* not lint */
#ifndef lint
-static const char rcsid[] = "$OpenBSD: diff3.c,v 1.10 2005/12/24 04:10:51 joris Exp $";
+static const char rcsid[] =
+ "$OpenBSD: diff3.c,v 1.11 2005/12/30 17:51:01 reyk Exp $";
#endif /* not lint */
#include <sys/queue.h>
@@ -247,8 +248,9 @@ cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2)
goto out;
if (diff3_conflicts != 0) {
- cvs_printf("%d conflict%s found during merge, please correct.\n",
- diff3_conflicts, (diff3_conflicts > 1) ? "s" : "");
+ cvs_printf("%d conflict%s found during merge, "
+ "please correct.\n", diff3_conflicts,
+ (diff3_conflicts > 1) ? "s" : "");
}
xfree(data);
@@ -760,7 +762,8 @@ edscript(int n)
(void)fseek(fp[2], (long)de[n].new.from, 0);
for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) {
j = k > BUFSIZ ? BUFSIZ : k;
- if (fread(block, (size_t)1, (size_t)j, fp[2]) != (size_t)j)
+ if (fread(block, (size_t)1, (size_t)j,
+ fp[2]) != (size_t)j)
return (-1);
block[j] = '\0';
diff_output("%s", block);
diff --git a/usr.bin/cvs/proto.c b/usr.bin/cvs/proto.c
index 3cb5b4eea79..dc3a1e00302 100644
--- a/usr.bin/cvs/proto.c
+++ b/usr.bin/cvs/proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proto.c,v 1.83 2005/12/30 16:47:36 joris Exp $ */
+/* $OpenBSD: proto.c,v 1.84 2005/12/30 17:51:01 reyk Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -220,7 +220,8 @@ cvs_connect(struct cvsroot *root)
} else if (cvs_subproc_pid == 0) {
if ((dup2(infd[0], STDIN_FILENO) == -1) ||
(dup2(outfd[1], STDOUT_FILENO) == -1))
- fatal("failed to setup standard streams for cvs server");
+ fatal("failed to setup standard streams "
+ "for cvs server");
(void)close(infd[1]);
(void)close(outfd[0]);
@@ -610,7 +611,7 @@ cvs_sendreq(struct cvsroot *root, u_int rid, const char *arg)
"remote end does not support request `%s'",
req->req_str);
}
-
+
return;
}
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index 3cccf2b0d01..1fc1ebc7777 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcs.c,v 1.121 2005/12/30 16:53:55 niallo Exp $ */
+/* $OpenBSD: rcs.c,v 1.122 2005/12/30 17:51:01 reyk Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -347,7 +347,7 @@ rcs_open(const char *path, int flags, ...)
TAILQ_INIT(&(rfp->rf_symbols));
TAILQ_INIT(&(rfp->rf_locks));
- if (!(rfp->rf_flags & RCS_CREATE)
+ if (!(rfp->rf_flags & RCS_CREATE)
&& (rcs_parse_init(rfp) < 0)) {
rcs_close(rfp);
return (NULL);
@@ -1684,7 +1684,7 @@ rcs_parse_desc(RCSFILE *rfp, RCSNUM *rev)
if ((rfp->rf_flags & PARSED_DESC)
|| (rfp->rf_flags & RCS_CREATE))
return (0);
- if (!(rfp->rf_flags & PARSED_DELTAS))
+ if (!(rfp->rf_flags & PARSED_DELTAS))
rcs_parse_deltas(rfp, rev);
/* do parsing */
ret = rcs_gettok(rfp);
@@ -2994,8 +2994,8 @@ cvs_checkout_rev(RCSFILE *rf, RCSNUM *rev, CVSFILE *cf, char *fpath,
l = 1;
cf->cf_entry = cvs_ent_open(cf->cf_dir, O_RDWR);
if (cf->cf_entry == NULL) {
- cvs_log(LP_ERR,
- "failed to open Entry file '%s'", cf->cf_dir);
+ cvs_log(LP_ERR, "failed to open Entry "
+ "file '%s'", cf->cf_dir);
goto out;
}
}
diff --git a/usr.bin/cvs/rcsnum.c b/usr.bin/cvs/rcsnum.c
index a7b3c841b47..555b7ceb113 100644
--- a/usr.bin/cvs/rcsnum.c
+++ b/usr.bin/cvs/rcsnum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcsnum.c,v 1.20 2005/12/27 16:08:26 niallo Exp $ */
+/* $OpenBSD: rcsnum.c,v 1.21 2005/12/30 17:51:01 reyk Exp $ */
/*
* Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
* All rights reserved.
@@ -125,17 +125,17 @@ rcsnum_tostr(const RCSNUM *nump, char *buf, size_t blen)
static char *
rcsnum_itoa(u_int16_t num, char *buf, size_t len)
{
- u_int16_t i;
- char *p;
+ u_int16_t i;
+ char *p;
- p = buf + len - 1;
- i = num;
+ p = buf + len - 1;
+ i = num;
bzero(buf, len);
- while (i) {
- *--p = '0' + (i % 10);
- i /= 10;
- }
- return (p);
+ while (i) {
+ *--p = '0' + (i % 10);
+ i /= 10;
+ }
+ return (p);
}
/*
diff --git a/usr.bin/cvs/xmalloc.c b/usr.bin/cvs/xmalloc.c
index d5f29671704..335ebe847d8 100644
--- a/usr.bin/cvs/xmalloc.c
+++ b/usr.bin/cvs/xmalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.3 2005/12/19 18:21:31 xsa Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.4 2005/12/30 17:51:01 reyk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -28,7 +28,8 @@ xmalloc(size_t size)
fatal("xmalloc: zero size");
ptr = malloc(size);
if (ptr == NULL)
- fatal("xmalloc: out of memory (allocating %lu bytes)", (u_long) size);
+ fatal("xmalloc: out of memory (allocating %lu bytes)",
+ (u_long) size);
return ptr;
}
@@ -44,7 +45,8 @@ xrealloc(void *ptr, size_t new_size)
else
new_ptr = realloc(ptr, new_size);
if (new_ptr == NULL)
- fatal("xrealloc: out of memory (new_size %lu bytes)", (u_long) new_size);
+ fatal("xrealloc: out of memory (new_size %lu bytes)",
+ (u_long) new_size);
return new_ptr;
}