diff options
| author |   joris <joris@openbsd.org> | 2005-12-30 02:03:28 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2005-12-30 02:03:28 +0000 |
| commit | 7e3938989ff2d420bcf32a15d765457c31e38841 (patch) | |
| tree | e4c6a27a8d85040d5e4604314a6cdded58f4336a /usr.bin/cvs/edit.c | |
| parent | spacing (diff) | |
| download | wireguard-openbsd-7e3938989ff2d420bcf32a15d765457c31e38841.tar.xz wireguard-openbsd-7e3938989ff2d420bcf32a15d765457c31e38841.zip | |
major cleanup of the functions handling the remote cvs protocol.
makes the code a lot more readable and understandable.
ok xsa@ and niallo@
Diffstat (limited to 'usr.bin/cvs/edit.c')
| -rw-r--r-- | usr.bin/cvs/edit.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/usr.bin/cvs/edit.c b/usr.bin/cvs/edit.c index 4dfa42081fb..f6f5ba1f982 100644 --- a/usr.bin/cvs/edit.c +++ b/usr.bin/cvs/edit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: edit.c,v 1.9 2005/10/10 17:51:53 xsa Exp $ */ +/* $OpenBSD: edit.c,v 1.10 2005/12/30 02:03:28 joris Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -172,46 +172,34 @@ cvs_edit_local(CVSFILE *cf, void *arg) static int cvs_editors_remote(CVSFILE *cf, void *arg) { - int ret; struct cvsroot *root; - ret = 0; root = CVS_DIR_ROOT(cf); if (cf->cf_type == DT_DIR) { if (cf->cf_cvstat == CVS_FST_UNKNOWN) - ret = cvs_sendreq(root, CVS_REQ_QUESTIONABLE, - cf->cf_name); + cvs_sendreq(root, CVS_REQ_QUESTIONABLE, cf->cf_name); else - ret = cvs_senddir(root, cf); - - if (ret == -1) - ret = CVS_EX_PROTO; - - return (ret); + cvs_senddir(root, cf); + return (0); } - if (cvs_sendentry(root, cf) < 0) - return (CVS_EX_PROTO); + cvs_sendentry(root, cf); switch (cf->cf_cvstat) { case CVS_FST_UNKNOWN: - ret = cvs_sendreq(root, CVS_REQ_QUESTIONABLE, cf->cf_name); + cvs_sendreq(root, CVS_REQ_QUESTIONABLE, cf->cf_name); break; case CVS_FST_UPTODATE: - ret = cvs_sendreq(root, CVS_REQ_UNCHANGED, cf->cf_name); + cvs_sendreq(root, CVS_REQ_UNCHANGED, cf->cf_name); break; case CVS_FST_ADDED: case CVS_FST_MODIFIED: - ret = cvs_sendreq(root, CVS_REQ_ISMODIFIED, cf->cf_name); + cvs_sendreq(root, CVS_REQ_ISMODIFIED, cf->cf_name); break; default: break; } - - if (ret == -1) - ret = CVS_EX_PROTO; - - return (ret); + return (0); } |