diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-01-27 12:56:29 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-01-27 12:56:29 +0000 |
| commit | 4b2365a2fc8df943e49ae4c31ec0f117ff1b900a (patch) | |
| tree | 1b935b8dd494d63d52a6e94507ce2da8213d10aa | |
| parent | 739bb3cc929be85a9a068c8a7ad8fcc528c50414 (diff) | |
cvs_mkadmin() cannot return < 0 anymore;
| -rw-r--r-- | usr.bin/cvs/add.c | 5 | ||||
| -rw-r--r-- | usr.bin/cvs/checkout.c | 8 | ||||
| -rw-r--r-- | usr.bin/cvs/req.c | 10 | ||||
| -rw-r--r-- | usr.bin/cvs/resp.c | 5 | ||||
| -rw-r--r-- | usr.bin/cvs/util.c | 7 |
5 files changed, 12 insertions, 23 deletions
diff --git a/usr.bin/cvs/add.c b/usr.bin/cvs/add.c index 45873305503..2ff6947aede 100644 --- a/usr.bin/cvs/add.c +++ b/usr.bin/cvs/add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: add.c,v 1.39 2006/01/27 12:45:21 xsa Exp $ */ +/* $OpenBSD: add.c,v 1.40 2006/01/27 12:56:28 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> @@ -271,8 +271,7 @@ cvs_add_directory(CVSFILE *cf) /* create CVS/ admin files */ if (cvs_noexec == 0) - if (cvs_mkadmin(fpath, root->cr_str, repo, tag, date, nb) == -1) - return (CVS_EX_FILE); + cvs_mkadmin(fpath, root->cr_str, repo, tag, date, nb); /* XXX Build the Entries line. */ if (strlcpy(entry, "D/", sizeof(entry)) >= sizeof(entry) || diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index 2688c9b56cb..fbd907f0f28 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.47 2006/01/27 12:45:21 xsa Exp $ */ +/* $OpenBSD: checkout.c,v 1.48 2006/01/27 12:56:28 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -206,10 +206,8 @@ cvs_checkout_pre_exec(struct cvsroot *root) fatal("cvs_checkout_pre_exec: mkdir `%s': %s", co_mods[i], strerror(errno)); - if (cvs_mkadmin(co_mods[i], root->cr_str, co_mods[i], - NULL, NULL, 0) < 0) - fatal("cvs_checkout_pre_exec: cvs_mkadmin `%s' failed", - co_mods[i]); + cvs_mkadmin(co_mods[i], root->cr_str, co_mods[i], NULL, + NULL, 0); if (sp != NULL) *sp = '/'; diff --git a/usr.bin/cvs/req.c b/usr.bin/cvs/req.c index 583b213ec31..56a90eeb388 100644 --- a/usr.bin/cvs/req.c +++ b/usr.bin/cvs/req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: req.c,v 1.41 2006/01/04 14:58:12 xsa Exp $ */ +/* $OpenBSD: req.c,v 1.42 2006/01/27 12:56:28 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -309,12 +309,8 @@ cvs_req_directory(int reqid, char *line) * Now, create the admin files in the top-level * directory for the temp repo. */ - if (cvs_mkadmin(cvs_server_tmpdir, cvs_rootstr, repo, - NULL, NULL, 0) < 0) { - cvs_log(LP_ERR, "failed to create admin files"); - xfree(repo); - return (-1); - } + cvs_mkadmin(cvs_server_tmpdir, cvs_rootstr, repo, NULL, + NULL, 0); } /* diff --git a/usr.bin/cvs/resp.c b/usr.bin/cvs/resp.c index fb30b5f2362..471c70ac635 100644 --- a/usr.bin/cvs/resp.c +++ b/usr.bin/cvs/resp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resp.c,v 1.70 2006/01/26 09:05:31 xsa Exp $ */ +/* $OpenBSD: resp.c,v 1.71 2006/01/27 12:56:28 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -872,8 +872,7 @@ resp_check_dir(struct cvsroot *root, const char *dir) fatal("resp_check_dir: path truncation"); } - if (cvs_mkadmin(dir, root->cr_str, repo, NULL, NULL, 0) < 0) - return (-1); + cvs_mkadmin(dir, root->cr_str, repo, NULL, NULL, 0); } if (strcmp(dir, cvs_resp_lastdir)) { diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c index d9d26c87a19..16100f2a327 100644 --- a/usr.bin/cvs/util.c +++ b/usr.bin/cvs/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.68 2006/01/25 11:19:51 xsa Exp $ */ +/* $OpenBSD: util.c,v 1.69 2006/01/27 12:56:28 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -675,10 +675,7 @@ cvs_create_dir(const char *path, int create_adm, char *root, char *repo) if (strlcat(rpath, "/", sizeof(rpath)) >= sizeof(rpath)) fatal("cvs_create_dir: path truncation"); - if (cvs_mkadmin(d, root, rpath, NULL, NULL, 0) < 0) { - cvs_log(LP_ERR, "failed to create adm files"); - goto done; - } + cvs_mkadmin(d, root, rpath, NULL, NULL, 0); } /* |