Rebase to OpenSolaris b103, in the process we are removing any code which did not...

[mirror_zfs.git] / zfs / lib / libnvpair / include / libnvpair.h

diff --git a/zfs/lib/libnvpair/include/libnvpair.h b/zfs/lib/libnvpair/include/libnvpair.h
index 9473cfe21e74aa12b305c1cc91e04f4dacb4d70b..e655e0d4069dce832ff8ae3644ccfab88649f39f 100644 (file)
--- a/zfs/lib/libnvpair/include/libnvpair.h
+++ b/zfs/lib/libnvpair/include/libnvpair.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,24 +19,27 @@
  * 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        _LIBNVPAIR_H
 #define        _LIBNVPAIR_H
 
-
+#pragma ident  "%Z%%M% %I%     %E% SMI"
 
 #include <sys/nvpair.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <regex.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 void nvlist_print(FILE *, nvlist_t *);
+int nvpair_value_match(nvpair_t *, int, char *, char **);
+int nvpair_value_match_regex(nvpair_t *, int, char *, regex_t *, char **);
 
 #ifdef __cplusplus
 }