Module Name: src
Committed By: haad
Date: Mon Mar 1 21:13:10 UTC 2010
Modified Files:
src/external/cddl/osnet/lib/libzpool: kernel.c
Added Files:
src/external/cddl/osnet/include: statcommon.h
Log Message:
Commit last to fixes which make zfs version 22 compiling again.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/include/statcommon.h
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/lib/libzpool/kernel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzpool/kernel.c
diff -u src/external/cddl/osnet/lib/libzpool/kernel.c:1.2 src/external/cddl/osnet/lib/libzpool/kernel.c:1.3
--- src/external/cddl/osnet/lib/libzpool/kernel.c:1.2 Sun Feb 28 17:36:51 2010
+++ src/external/cddl/osnet/lib/libzpool/kernel.c Mon Mar 1 21:13:10 2010
@@ -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 @@
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);
+}
Added files:
Index: src/external/cddl/osnet/include/statcommon.h
diff -u /dev/null src/external/cddl/osnet/include/statcommon.h:1.1
--- /dev/null Mon Mar 1 21:13:10 2010
+++ src/external/cddl/osnet/include/statcommon.h Mon Mar 1 21:13:09 2010
@@ -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
