diff options
| author |   xsa <xsa@openbsd.org> | 2006-04-07 12:54:40 +0000 |
|---|---|---|
| committer | xsa <xsa@openbsd.org> | 2006-04-07 12:54:40 +0000 |
| commit | b2eabd37b8f61e93c17b1b761570bd152410ede0 (patch) | |
| tree | d348a4b5490dac92fe618ddabffc645a6f468d3f | |
| parent | Add work around for mbuf leak in the tx path until we (diff) | |
| download | wireguard-openbsd-b2eabd37b8f61e93c17b1b761570bd152410ede0.tar.xz wireguard-openbsd-b2eabd37b8f61e93c17b1b761570bd152410ede0.zip | |
change rcs_set_mtime() return type to void.
| -rw-r--r-- | usr.bin/rcs/rcsprog.c | 15 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsprog.h | 4 |
2 files changed, 7 insertions, 12 deletions
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index bf402fa77ec..245fc38ecc2 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.93 2006/04/06 10:13:00 xsa Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.94 2006/04/07 12:54:40 xsa Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -113,25 +113,20 @@ rcs_get_mtime(const char *filename) * rcs_set_mtime() * * Set <filename> last modified time to <mtime> if it's not set to -1. - * Returns 0 on success, or -1 on failure. */ -int +void rcs_set_mtime(const char *filename, time_t mtime) { static struct timeval tv[2]; if (mtime == -1) - return (0); + return; tv[0].tv_sec = mtime; tv[1].tv_sec = tv[0].tv_sec; - if (utimes(filename, tv) == -1) { - cvs_log(LP_ERRNO, "error setting utimes"); - return (-1); - } - - return (0); + if (utimes(filename, tv) == -1) + fatal("error setting utimes: %s", strerror(errno)); } int diff --git a/usr.bin/rcs/rcsprog.h b/usr.bin/rcs/rcsprog.h index e08bcdf964c..cdace9ce75c 100644 --- a/usr.bin/rcs/rcsprog.h +++ b/usr.bin/rcs/rcsprog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.h,v 1.41 2006/04/01 06:19:29 ray Exp $ */ +/* $OpenBSD: rcsprog.h,v 1.42 2006/04/07 12:54:40 xsa Exp $ */ /* * Copyright (c) 2005 Joris Vink <joris@openbsd.org> * All rights reserved. @@ -107,7 +107,7 @@ void rcsmerge_usage(void); int rcs_init(char *, char **, int); int rcs_getopt(int, char **, const char *); int rcs_main(int, char **); -int rcs_set_mtime(const char *, time_t); +void rcs_set_mtime(const char *, time_t); char *rcs_choosefile(const char *); int rcs_statfile(char *, char *, size_t); time_t rcs_get_mtime(const char *); |