summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxsa <xsa@openbsd.org>2005-12-02 13:53:43 +0000
committerxsa <xsa@openbsd.org>2005-12-02 13:53:43 +0000
commit61b81e270d500877840dbaadcbf57ae0c64dd346 (patch)
treed2ab5a08e306454f5badf957389f0f2db0d3aef6
parentin checkin_update(): (diff)
downloadwireguard-openbsd-61b81e270d500877840dbaadcbf57ae0c64dd346.tar.xz
wireguard-openbsd-61b81e270d500877840dbaadcbf57ae0c64dd346.zip
better..
-rw-r--r--usr.bin/rcs/ci.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index 768307676f5..42d1e7690ca 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ci.c,v 1.77 2005/12/02 13:43:32 xsa Exp $ */
+/* $OpenBSD: ci.c,v 1.78 2005/12/02 13:53:43 xsa Exp $ */
/*
* Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org>
* All rights reserved.
@@ -452,11 +452,8 @@ checkin_update(struct checkin_params *pb)
return (-1);
}
- if (checkin_checklock(pb) < 0) {
- cvs_log(LP_ERR, "%s: no lock set by %s",
- pb->file->rf_path, pb->username);
+ if (checkin_checklock(pb) < 0)
return (-1);
- }
/* Load file contents */
if ((bp = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
@@ -715,7 +712,8 @@ checkin_checklock(struct checkin_params *pb)
}
if ((found == 0) && (notlocked == 0)) {
- cvs_log(LP_ERR, "no locks set for '%s'", pb->username);
+ cvs_log(LP_ERR,
+ "%s: no lock by %s", pb->file->rf_path, pb->username);
rcs_close(pb->file);
return (-1);
}