diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-12-21 20:06:26 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-12-21 20:06:26 +0000 |
| commit | a5c6c38ac3744b7a3b50cbe6e65213711ae19006 (patch) | |
| tree | acfc3aa922cdbd2ebec4e5b137c7d858255f0727 | |
| parent | 651cd0748a57aead45d28840a7711da03f51fdf7 (diff) | |
cvs_logmsg_open() and cvs_logmsg_get() cannot fail anymore;
| -rw-r--r-- | usr.bin/cvs/commit.c | 6 | ||||
| -rw-r--r-- | usr.bin/cvs/import.c | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/cvs/commit.c b/usr.bin/cvs/commit.c index 245725337ee..cd5795753d6 100644 --- a/usr.bin/cvs/commit.c +++ b/usr.bin/cvs/commit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: commit.c,v 1.47 2005/12/10 20:27:45 joris Exp $ */ +/* $OpenBSD: commit.c,v 1.48 2005/12/21 20:06:25 xsa Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -106,8 +106,8 @@ cvs_commit_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg) return (CVS_EX_USAGE); } - if ((mfile != NULL) && (cvs_msg = cvs_logmsg_open(mfile)) == NULL) - return (CVS_EX_DATA); + if (mfile != NULL) + cvs_msg = cvs_logmsg_open(mfile); *arg = optind; diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 58f26ec4be9..ed36f5e3bb8 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.32 2005/12/20 18:17:01 xsa Exp $ */ +/* $OpenBSD: import.c,v 1.33 2005/12/21 20:06:25 xsa Exp $ */ /* * Copyright (c) 2004 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -124,9 +124,8 @@ cvs_import_init(struct cvs_cmd *cmd, int argc, char **argv, int *arg) *arg = optind + 3; - if ((cvs_msg == NULL) && - (cvs_msg = cvs_logmsg_get(NULL, NULL, NULL, NULL)) == NULL) - return (CVS_EX_DATA); + if (cvs_msg == NULL) + cvs_msg = cvs_logmsg_get(NULL, NULL, NULL, NULL); return (0); } |