src - OpenBSD base system

diff options


context:
space:
mode:

author	Joris Vink <joris@cvs.openbsd.org>	2005-07-07 14:27:58 +0000
committer	Joris Vink <joris@cvs.openbsd.org>	2005-07-07 14:27:58 +0000
commit	783839c81765c1d9dba3662d9e81f2fd3959f139 (patch)
tree	c7e89f8aec1bcdcf28f7713aec4a702a9e1f4188 /usr.bin/cvs
parent	a1b79960d99297510a8abae0e45691a242bc5463 (diff)

remove trailing whitespaces

from deraadt@

Diffstat (limited to 'usr.bin/cvs')

-rw-r--r--

usr.bin/cvs/admin.c

-rw-r--r--

usr.bin/cvs/annotate.c

-rw-r--r--

usr.bin/cvs/buf.c

-rw-r--r--

usr.bin/cvs/checkout.c

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

usr.bin/cvs/release.c

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

19 files changed, 63 insertions, 65 deletions

diff --git a/usr.bin/cvs/admin.c b/usr.bin/cvs/admin.c
index c4686cb0e24..063df4cb0db 100644
--- a/usr.bin/cvs/admin.c
+++ b/usr.bin/cvs/admin.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: admin.c,v 1.17 2005/05/31 08:58:47 xsa Exp $ */

+/* $OpenBSD: admin.c,v 1.18 2005/07/07 14:27:57 joris Exp $ */

@@ -216,7 +216,7 @@ cvs_admin_pre_exec(struct cvsroot *root)

if (root->cr_method == CVS_METHOD_LOCAL)

return (0);

- if ((alist != NULL) && ((cvs_sendarg(root, "-a", 0) < 0) ||

+ if ((alist != NULL) && ((cvs_sendarg(root, "-a", 0) < 0) ||

(cvs_sendarg(root, alist, 0) < 0)))

return (CVS_EX_PROTO);

diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c
index fa656527e1d..a098d1130a8 100644
--- a/usr.bin/cvs/annotate.c
+++ b/usr.bin/cvs/annotate.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: annotate.c,v 1.18 2005/07/04 10:21:03 xsa Exp $ */

+/* $OpenBSD: annotate.c,v 1.19 2005/07/07 14:27:57 joris Exp $ */

@@ -59,7 +59,7 @@ struct cvs_cmd cvs_cmd_annotate = {

NULL,

CVS_CMD_ALLOWSPEC | CVS_CMD_SENDDIR | CVS_CMD_SENDARGS2

-};

+};

static char *date, *rev;

static int usehead;

diff --git a/usr.bin/cvs/buf.c b/usr.bin/cvs/buf.c
index 6980b389682..1f2ffdd9c57 100644
--- a/usr.bin/cvs/buf.c
+++ b/usr.bin/cvs/buf.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: buf.c,v 1.12 2005/06/02 07:16:38 xsa Exp $ */

+/* $OpenBSD: buf.c,v 1.13 2005/07/07 14:27:57 joris Exp $ */

@@ -414,7 +414,7 @@ cvs_buf_write(BUF *b, const char *path, mode_t mode)

fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, mode);

if (fd == -1) {

- cvs_log(LP_ERRNO, "failed to open file `%s'", path);

+ cvs_log(LP_ERRNO, "failed to open file `%s'", path);

return (-1);

}

@@ -431,7 +431,7 @@ cvs_buf_write(BUF *b, const char *path, mode_t mode)

* cvs_buf_write_stmp()

- * Write the contents of the buffer <b> to a temporary file whose path is

+ * Write the contents of the buffer <b> to a temporary file whose path is

* specified using <template> (see mkstemp.3). NB. This function will modify

* <template>, as per mkstemp

@@ -443,14 +443,14 @@ cvs_buf_write_stmp(BUF *b, char *template, mode_t mode)

fd = mkstemp(template);

if (fd == -1) {

- cvs_log(LP_ERRNO, "failed to mkstemp file `%s': %s",

+ cvs_log(LP_ERRNO, "failed to mkstemp file `%s': %s",

template, strerror(errno));

return (-1);

}

ret = cvs_buf_write_fd(b, fd);

if (ret == -1) {

- cvs_log(LP_ERRNO, "failed to write to temp file `%s': %s",

+ cvs_log(LP_ERRNO, "failed to write to temp file `%s': %s",

template, strerror(errno));

(void)unlink(template);

}

diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c
index 5158e04e070..94a2f44fc57 100644
--- a/usr.bin/cvs/checkout.c
+++ b/usr.bin/cvs/checkout.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: checkout.c,v 1.34 2005/06/28 08:54:54 xsa Exp $ */

+/* $OpenBSD: checkout.c,v 1.35 2005/07/07 14:27:57 joris Exp $ */

@@ -191,7 +191,7 @@ static int

cvs_checkout_pre_exec(struct cvsroot *root)

{

int i;

- char *sp;

+ char *sp;

for (i = 0; i < co_nmod; i++) {

if ((sp = strchr(co_mods[i], '/')) != NULL)

diff --git a/usr.bin/cvs/cmd.c b/usr.bin/cvs/cmd.c
index a9cbc1082e1..e1abddbda29 100644
--- a/usr.bin/cvs/cmd.c
+++ b/usr.bin/cvs/cmd.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: cmd.c,v 1.27 2005/07/04 07:11:10 xsa Exp $ */

+/* $OpenBSD: cmd.c,v 1.28 2005/07/07 14:27:57 joris Exp $ */

@@ -228,7 +228,7 @@ cvs_startcmd(struct cvs_cmd *cmd, int argc, char **argv)

if (cmd->cmd_flags & CVS_CMD_PRUNEDIRS)

cvs_file_prune(fpath);

if (root->cr_method != CVS_METHOD_LOCAL)

cvs_disconnect(root);

diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c
index f7bba3c6a5e..57ff833f12e 100644
--- a/usr.bin/cvs/commit.c
+++ b/usr.bin/cvs/commit.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: commit.c,v 1.37 2005/05/31 08:58:47 xsa Exp $ */

+/* $OpenBSD: commit.c,v 1.38 2005/07/07 14:27:57 joris Exp $ */

@@ -126,7 +126,7 @@ cvs_commit_pre_exec(struct cvsroot *root)

CVSFILE *cfp;

CVSFILE *tmp;

int flags = CF_RECURSE | CF_IGNORE | CF_SORT;

SIMPLEQ_INIT(&cl);

if (commit_fcount != 0) {

diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c
index 995333bdb65..f2215929eb5 100644
--- a/usr.bin/cvs/cvs.c
+++ b/usr.bin/cvs/cvs.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: cvs.c,v 1.71 2005/06/16 07:46:42 xsa Exp $ */

+/* $OpenBSD: cvs.c,v 1.72 2005/07/07 14:27:57 joris Exp $ */

@@ -76,8 +76,7 @@ static TAILQ_HEAD(, cvs_var) cvs_variables;

void usage (void);

static void cvs_read_rcfile (void);

-int cvs_getopt (int, char **);

+int cvs_getopt(int, char **);

* usage()

diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index 0d93471478e..20724293f50 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: cvs.h,v 1.67 2005/06/17 15:09:55 joris Exp $ */

+/* $OpenBSD: cvs.h,v 1.68 2005/07/07 14:27:57 joris Exp $ */

@@ -67,7 +67,7 @@

#define CVS_OP_EDIT 7

#define CVS_OP_EDITORS 8

#define CVS_OP_EXPORT 9

-#define CVS_OP_HISTORY 10

+#define CVS_OP_HISTORY 10

#define CVS_OP_IMPORT 11

#define CVS_OP_INIT 12

#define CVS_OP_LOG 13

diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c
index 5fecf74401f..66cda12878a 100644
--- a/usr.bin/cvs/file.c
+++ b/usr.bin/cvs/file.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: file.c,v 1.92 2005/07/05 16:55:30 joris Exp $ */

+/* $OpenBSD: file.c,v 1.93 2005/07/07 14:27:57 joris Exp $ */

@@ -788,7 +788,7 @@ cvs_file_getdir(CVSFILE *cf, int flags, char *path, int (*cb)(CVSFILE *, void *)

if (cfp->cf_type != DT_DIR) {

SIMPLEQ_INSERT_TAIL(&(cf->cf_files), cfp,

- cf_list);

+ cf_list);

nfiles++;

}

} else {

@@ -848,7 +848,7 @@ cvs_file_getdir(CVSFILE *cf, int flags, char *path, int (*cb)(CVSFILE *, void *)

if (cfp->cf_type == DT_DIR) {

ndirs++;

- SIMPLEQ_INSERT_TAIL(&dirs, cfp,

+ SIMPLEQ_INSERT_TAIL(&dirs, cfp,

cf_list);

} else {

/* callback for the file */

@@ -1116,7 +1116,7 @@ cvs_file_lget(const char *path, int flags, CVSFILE *parent, struct cvs_ent *ent)

else if (ent->ce_type == CVS_ENT_DIR)

cfp->cf_type = DT_DIR;

else

- cvs_log(LP_WARN, "unknown ce_type %d",

+ cvs_log(LP_WARN, "unknown ce_type %d",

ent->ce_type);

if (ent->ce_status == CVS_ENT_REMOVED)

@@ -1240,7 +1240,7 @@ cvs_file_prune(char *path)

cvs_log(LP_ERR, "failed to prune `%s'", path);

empty = 0;

}

- }

+ }

return (empty);

}

diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c
index f0e8cdc2053..8e818d56053 100644
--- a/usr.bin/cvs/getlog.c
+++ b/usr.bin/cvs/getlog.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: getlog.c,v 1.34 2005/07/01 15:00:22 xsa Exp $ */

+/* $OpenBSD: getlog.c,v 1.35 2005/07/07 14:27:57 joris Exp $ */

@@ -275,7 +275,7 @@ cvs_getlog_local(CVSFILE *cf, void *arg)

if (!log_honly && !log_lhonly)

cvs_printf("\tselected revisions: %u", nrev);

cvs_printf("\n");

if (!log_honly || log_lhonly)

@@ -286,7 +286,7 @@ cvs_getlog_local(CVSFILE *cf, void *arg)

rcsnum_tostr(rdp->rd_num, numbuf, sizeof(numbuf));

cvs_printf(CVS_GETLOG_REVSEP "\nrevision %s\n", numbuf);

cvs_printf("date: %d/%02d/%02d %02d:%02d:%02d;"

- " author: %s; state: %s;\n",

+ " author: %s; state: %s;\n",

rdp->rd_date.tm_year + 1900,

rdp->rd_date.tm_mon + 1,

rdp->rd_date.tm_mday, rdp->rd_date.tm_hour,

diff --git a/usr.bin/cvs/log.c b/usr.bin/cvs/log.c
index 4b8b3b7ad57..8979d44d86d 100644
--- a/usr.bin/cvs/log.c
+++ b/usr.bin/cvs/log.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: log.c,v 1.20 2005/06/07 09:06:15 joris Exp $ */

+/* $OpenBSD: log.c,v 1.21 2005/07/07 14:27:57 joris Exp $ */

@@ -306,7 +306,7 @@ cvs_printf(const char *fmt, ...)

for (sp = dp; *sp != '\0'; sp++)

;

- if (send_m) {

+ if (send_m) {

send_m = 0;

putc('M', stdout);

putc(' ', stdout);

diff --git a/usr.bin/cvs/proto.c b/usr.bin/cvs/proto.c
index c461a791401..c92d9b1e4eb 100644
--- a/usr.bin/cvs/proto.c
+++ b/usr.bin/cvs/proto.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: proto.c,v 1.57 2005/06/10 21:32:08 joris Exp $ */

+/* $OpenBSD: proto.c,v 1.58 2005/07/07 14:27:57 joris Exp $ */

@@ -1116,7 +1116,7 @@ cvs_initlog(void)

default:

fpath[0] = '\0';

break;

- }

+ }

if (fpath[0] != '\0') {

strlcat(rpath, "-", sizeof(rpath));

diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c
index bd425dddb1a..3bb58ebd8b8 100644
--- a/usr.bin/cvs/rcs.c
+++ b/usr.bin/cvs/rcs.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: rcs.c,v 1.55 2005/05/31 08:58:48 xsa Exp $ */

+/* $OpenBSD: rcs.c,v 1.56 2005/07/07 14:27:57 joris Exp $ */

@@ -905,7 +905,7 @@ rcs_lock_add(RCSFILE *file, const char *user, RCSNUM *rev)

* Returns 0 on success, or -1 on failure.

int

-rcs_lock_remove(RCSFILE *file, const RCSNUM *rev)

+rcs_lock_remove(RCSFILE *file, const RCSNUM *rev)

{

struct rcs_lock *lkp;

diff --git a/usr.bin/cvs/release.c b/usr.bin/cvs/release.c
index 294f316ff94..0435f41801d 100644
--- a/usr.bin/cvs/release.c
+++ b/usr.bin/cvs/release.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: release.c,v 1.11 2005/06/30 16:37:29 joris Exp $ */

+/* $OpenBSD: release.c,v 1.12 2005/07/07 14:27:57 joris Exp $ */

@@ -173,7 +173,7 @@ cvs_release_dir(CVSFILE *cdir, void *arg)

/* XXX kept for compat reason of `cvs update' output */

/* save current working directory for further use */

if ((wdir = getcwd(cwd, sizeof(cwd))) == NULL)

- cvs_log(LP_ERRNO, "cannot get current dir");

+ cvs_log(LP_ERRNO, "cannot get current dir");

/* change dir before running the `cvs update' command */

if (chdir(dpath) == -1) {

@@ -216,7 +216,7 @@ cvs_release_dir(CVSFILE *cdir, void *arg)

if (cvs_release_yesno() == -1) { /* No */

(void)fprintf(stderr,

- "** `%s' aborted by user choice.\n",

+ "** `%s' aborted by user choice.\n",

cvs_command);

return (-1);

}

@@ -231,7 +231,7 @@ cvs_release_dir(CVSFILE *cdir, void *arg)

if (dflag == 1) {

if (!cvs_noexec && cvs_remove_dir(dpath) != 0) {

cvs_log(LP_ERRNO,

- "deletion of directory `%s' failed",

+ "deletion of directory `%s' failed",

dpath);

return (CVS_EX_FILE);

}

diff --git a/usr.bin/cvs/remove.c b/usr.bin/cvs/remove.c
index 08c0c3c776a..4b4b053a3fc 100644
--- a/usr.bin/cvs/remove.c
+++ b/usr.bin/cvs/remove.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: remove.c,v 1.16 2005/05/24 04:12:25 jfb Exp $ */

+/* $OpenBSD: remove.c,v 1.17 2005/07/07 14:27:57 joris Exp $ */

@@ -132,7 +132,7 @@ cvs_remove_file(CVSFILE *cf, void *arg)

if (cvs_sendentry(root, cf) < 0)

return (CVS_EX_PROTO);

if (cf->cf_cvstat != CVS_FST_LOST && force_remove != 1) {

if (cvs_sendreq(root, CVS_REQ_MODIFIED,

CVS_FILE_NAME(cf)) < 0) {

diff --git a/usr.bin/cvs/repo.c b/usr.bin/cvs/repo.c
index 027738a4c38..a1c5d6a54d7 100644
--- a/usr.bin/cvs/repo.c
+++ b/usr.bin/cvs/repo.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: repo.c,v 1.4 2005/05/31 08:58:48 xsa Exp $ */

+/* $OpenBSD: repo.c,v 1.5 2005/07/07 14:27:57 joris Exp $ */

@@ -197,7 +197,7 @@ cvs_repo_lockent(CVSRPENT *ent, int type, pid_t owner)

* Another process has already locked the entry with a write

* lock, so regardless of the type of lock we are requesting,

* we'll have to wait in the pending requests queue.

- */

+ */

if (ent->cr_wlock->lk_owner == owner) {

cvs_log(LP_WARN, "double-lock attempt");

free(lk);

@@ -282,7 +282,7 @@ cvs_repo_unlockent(CVSRPENT *ent, pid_t owner)

* cvs_repo_alias()

* Add a new module entry with name <alias> in the repository <repo>, which

- * points to the path <path> within the repository.

+ * points to the path <path> within the repository.

* Returns 0 on success, or -1 on failure.

int

diff --git a/usr.bin/cvs/tag.c b/usr.bin/cvs/tag.c
index 933b2e6e956..64b22f01eaa 100644
--- a/usr.bin/cvs/tag.c
+++ b/usr.bin/cvs/tag.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: tag.c,v 1.21 2005/06/28 13:20:53 xsa Exp $ */

+/* $OpenBSD: tag.c,v 1.22 2005/07/07 14:27:57 joris Exp $ */

@@ -229,7 +229,7 @@ cvs_tag_remote(CVSFILE *cfp, void *arg)

ret = cvs_sendreq(root, CVS_REQ_UNCHANGED, cfp->cf_name);

break;

case CVS_FST_MODIFIED:

- ret = cvs_sendreq(root, CVS_REQ_ISMODIFIED, cfp->cf_name);

+ ret = cvs_sendreq(root, CVS_REQ_ISMODIFIED, cfp->cf_name);

default:

break;

}

diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index 3f2826c05bc..343fc625542 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: update.c,v 1.37 2005/06/30 16:47:19 joris Exp $ */

+/* $OpenBSD: update.c,v 1.38 2005/07/07 14:27:57 joris Exp $ */

@@ -135,7 +135,7 @@ static int

cvs_update_pre_exec(struct cvsroot *root)

{

if (root->cr_method != CVS_METHOD_LOCAL) {

- if ((cvs_cmd_update.cmd_flags & CVS_CMD_PRUNEDIRS) &&

+ if ((cvs_cmd_update.cmd_flags & CVS_CMD_PRUNEDIRS) &&

(cvs_sendarg(root, "-P", 0) < 0))

return (CVS_EX_PROTO);

if (Aflag && cvs_sendarg(root, "-A", 0) < 0)

diff --git a/usr.bin/cvs/watch.c b/usr.bin/cvs/watch.c
index 018e753388d..f565e8fc012 100644
--- a/usr.bin/cvs/watch.c
+++ b/usr.bin/cvs/watch.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: watch.c,v 1.3 2005/06/15 09:17:14 xsa Exp $ */

+/* $OpenBSD: watch.c,v 1.4 2005/07/07 14:27:57 joris Exp $ */

@@ -63,20 +63,20 @@ struct cvs_cmd cvs_cmd_watch = {

};

struct cvs_cmd cvs_cmd_watchers = {

- CVS_OP_WATCHERS, CVS_REQ_WATCHERS, "watchers",

- {},

- "See who is watching a file",

- "[-lR] [file ...]",

- "lR",

- NULL,

- CF_SORT | CF_RECURSE,

- cvs_watch_init,

- NULL,

- cvs_watchers_remote,

- cvs_watchers_local,

- NULL,

- 0

+ CVS_OP_WATCHERS, CVS_REQ_WATCHERS, "watchers",

+ {},

+ "See who is watching a file",

+ "[-lR] [file ...]",

+ "lR",

+ NULL,

+ CF_SORT | CF_RECURSE,

+ cvs_watch_init,

+ NULL,

+ cvs_watchers_remote,

+ cvs_watchers_local,

+ NULL,

+ 0

};

@@ -85,7 +85,7 @@ static int

cvs_watch_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg)

{

int ch;

while ((ch = getopt(argc, argv, cmd->cmd_opts)) != -1) {

switch (ch) {

case 'a':

@@ -143,8 +143,7 @@ cvs_watchers_remote(CVSFILE *file, void *arg)

{

return (CVS_EX_OK);

}

* cvs_watchers_local()