diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-06-02 20:19:31 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-06-02 20:19:31 +0000 |
| commit | 39e000f21709aa69b5b8a56b4fa87a225ab35e72 (patch) | |
| tree | 3d199568f0a5e00e6d400df5a68068b2f5fb8ed7 /usr.bin | |
| parent | ad5af1e36e90c554824c209077c6d62c2e24645c (diff) | |
remove unneeded error reporting when using cvs_path_cat(), the
function does it for us.
OK jfb@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/entries.c | 7 | ||||
| -rw-r--r-- | usr.bin/cvs/util.c | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/usr.bin/cvs/entries.c b/usr.bin/cvs/entries.c index 39a90bceb99..4ad91495a61 100644 --- a/usr.bin/cvs/entries.c +++ b/usr.bin/cvs/entries.c @@ -1,4 +1,4 @@ -/* $OpenBSD: entries.c,v 1.34 2005/05/31 08:58:47 xsa Exp $ */ +/* $OpenBSD: entries.c,v 1.35 2005/06/02 20:19:30 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -64,11 +64,8 @@ cvs_ent_open(const char *dir, int flags) memset(mode, 0, sizeof(mode)); len = cvs_path_cat(dir, CVS_PATH_ENTRIES, entpath, sizeof(entpath)); - if (len >= sizeof(entpath)) { - errno = ENAMETOOLONG; - cvs_log(LP_ERRNO, "%s", entpath); + if (len >= sizeof(entpath)) return (NULL); - } switch (flags & O_ACCMODE) { case O_WRONLY: diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c index 7fe86db3baf..9e5c1af9ee4 100644 --- a/usr.bin/cvs/util.c +++ b/usr.bin/cvs/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.31 2005/05/31 08:58:48 xsa Exp $ */ +/* $OpenBSD: util.c,v 1.32 2005/06/02 20:19:30 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -538,8 +538,6 @@ cvs_remove_dir(const char *path) len = cvs_path_cat(path, ent->d_name, fpath, sizeof(fpath)); if (len >= sizeof(fpath)) { - errno = ENAMETOOLONG; - cvs_log(LP_ERRNO, "%s", fpath); closedir(dirp); return (-1); } |