diff options
| author |   jakob <jakob@openbsd.org> | 2007-12-09 13:37:00 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2007-12-09 13:37:00 +0000 |
| commit | 75290b878677166fb160137e559260952e86a7d9 (patch) | |
| tree | 41bf2b12cf0f7ceff8a71597d4791d0618a9a4b8 /usr.sbin/bind/lib/isc/unix/file.c | |
| parent | Nuke evil common, spotted by martin@ (diff) | |
| download | wireguard-openbsd-75290b878677166fb160137e559260952e86a7d9.tar.xz wireguard-openbsd-75290b878677166fb160137e559260952e86a7d9.zip | |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/lib/isc/unix/file.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/file.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/bind/lib/isc/unix/file.c b/usr.sbin/bind/lib/isc/unix/file.c index c5610ef52f5..4fc69cd49f6 100644 --- a/usr.sbin/bind/lib/isc/unix/file.c +++ b/usr.sbin/bind/lib/isc/unix/file.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2002 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -48,7 +48,9 @@ * SUCH DAMAGE. */ -/* $ISC: file.c,v 1.38.12.8 2004/03/16 05:50:25 marka Exp $ */ +/* $ISC: file.c,v 1.47.18.2 2005/04/29 00:17:07 marka Exp $ */ + +/*! \file */ #include <config.h> @@ -154,7 +156,7 @@ isc_file_settime(const char *file, isc_time_t *time) { } #undef TEMPLATE -#define TEMPLATE "tmp-XXXXXXXXXX" /* 14 characters. */ +#define TEMPLATE "tmp-XXXXXXXXXX" /*%< 14 characters. */ isc_result_t isc_file_mktemplate(const char *path, char *buf, size_t buflen) { |