Rebase to OpenSolaris b103, in the process we are removing any code which did not originate from the OpenSolaris source. These changes will be reintroduced in topic branches for easier tracking

3 files changed, 11 insertions, 22 deletions

diff --git a/zfs/lib/libuutil/include/libuutil.h b/zfs/lib/libuutil/include/libuutil.h
index 076be7605..ccd46b977 100644
--- a/zfs/lib/libuutil/include/libuutil.h
+++ b/zfs/lib/libuutil/include/libuutil.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef	_LIBUUTIL_H
 #define	_LIBUUTIL_H
 
-
-
 #include <sys/types.h>
 #include <stdarg.h>
 
@@ -148,6 +145,7 @@ extern int uu_open_tmp(const char *dir, uint_t uflags);
 /*PRINTFLIKE1*/
 extern char *uu_msprintf(const char *format, ...);
 extern void *uu_zalloc(size_t);
+extern char *uu_strdup(const char *);
 extern void uu_free(void *);
 
 /*
diff --git a/zfs/lib/libuutil/include/libuutil_common.h b/zfs/lib/libuutil/include/libuutil_common.h
index 8a0f1840e..9ebaaedfd 100644
--- a/zfs/lib/libuutil/include/libuutil_common.h
+++ b/zfs/lib/libuutil/include/libuutil_common.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -21,22 +20,14 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef	_LIBUUTIL_COMMON_H
 #define	_LIBUUTIL_COMMON_H
 
-
-
-/*
- * We don't bind to the internal libc interfaces if this is a
- * native build.
- */
-#ifndef NATIVE_BUILD
-#include "c_synonyms.h"
-#endif
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <libuutil.h>
 #include <libuutil_impl.h>
diff --git a/zfs/lib/libuutil/include/libuutil_impl.h b/zfs/lib/libuutil/include/libuutil_impl.h
index f978b475e..9466e5974 100644
--- a/zfs/lib/libuutil/include/libuutil_impl.h
+++ b/zfs/lib/libuutil/include/libuutil_impl.h
@@ -27,7 +27,7 @@
 #ifndef	_LIBUUTIL_IMPL_H
 #define	_LIBUUTIL_IMPL_H
 
-
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <libuutil.h>
 #include <pthread.h>
@@ -40,11 +40,11 @@ extern "C" {
 #endif
 
 void uu_set_error(uint_t);
-
+#pragma rarely_called(uu_set_error)
 
 /*PRINTFLIKE1*/
 void uu_panic(const char *format, ...);
-
+#pragma rarely_called(uu_panic)
 
 struct uu_dprintf {
 	char	*uud_name;