diff options
| author | haad <haad@NetBSD.org> | 2010-03-01 21:13:09 +0000 |
|---|---|---|
| committer | haad <haad@NetBSD.org> | 2010-03-01 21:13:09 +0000 |
| commit | bbc4932093d48eaccd2ff1cdaddf8e978875c3a0 (patch) | |
| tree | d38410528197e1f7058cc7b587f39c3914d76bc2 /external | |
| parent | b95d388b8c61cd19f81b6bd3003546625a5cdeae (diff) | |
Commit last to fixes which make zfs version 22 compiling again.
Diffstat (limited to 'external')
| -rw-r--r-- | external/cddl/osnet/include/statcommon.h | 8 | ||||
| -rw-r--r-- | external/cddl/osnet/lib/libzpool/kernel.c | 28 |
2 files changed, 34 insertions, 2 deletions
diff --git a/external/cddl/osnet/include/statcommon.h b/external/cddl/osnet/include/statcommon.h new file mode 100644 index 00000000000..1e598f03d01 --- /dev/null +++ b/external/cddl/osnet/include/statcommon.h @@ -0,0 +1,8 @@ +#ifndef _STATCOMMON_H_ +#define _STATCOMMON_H_ + +#define NODATE 0 /* Default: No time stamp */ +#define DDATE 1 /* Standard date format */ +#define UDATE 2 /* Internal representation of Unix time */ + +#endif diff --git a/external/cddl/osnet/lib/libzpool/kernel.c b/external/cddl/osnet/lib/libzpool/kernel.c index a06dcf668fe..28d3d51400e 100644 --- a/external/cddl/osnet/lib/libzpool/kernel.c +++ b/external/cddl/osnet/lib/libzpool/kernel.c @@ -1,4 +1,4 @@ -/* $NetBSD: kernel.c,v 1.2 2010/02/28 17:36:51 haad Exp $ */ +/* $NetBSD: kernel.c,v 1.3 2010/03/01 21:13:10 haad Exp $ */ /* * CDDL HEADER START @@ -29,7 +29,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" #include <sys/cdefs.h> -__RCSID("$NetBSD: kernel.c,v 1.2 2010/02/28 17:36:51 haad Exp $"); +__RCSID("$NetBSD: kernel.c,v 1.3 2010/03/01 21:13:10 haad Exp $"); #include <sys/zfs_context.h> #include <sys/sysctl.h> @@ -703,3 +703,27 @@ print_timestamp(int fmt) return; } + +/* + * Do not change the length of the returned string; it must be freed + * with strfree(). + */ +char * +kmem_asprintf(const char *fmt, ...) +{ + int size; + va_list adx; + char *buf; + + va_start(adx, fmt); + size = vsnprintf(NULL, 0, fmt, adx) + 1; + va_end(adx); + + buf = kmem_alloc(size, KM_SLEEP); + + va_start(adx, fmt); + size = vsnprintf(buf, size, fmt, adx); + va_end(adx); + + return (buf); +} |
