diff -r 63d3bf696d85 -r 19b502ccabc8 components/visual-panels/smf/src/cmd/rad/mod/smf/smfutil.h
--- a/components/visual-panels/smf/src/cmd/rad/mod/smf/smfutil.h	Fri Jun 29 12:23:11 2012 -0700
+++ b/components/visual-panels/smf/src/cmd/rad/mod/smf/smfutil.h	Sat Jun 30 06:30:16 2012 -0700
@@ -108,8 +108,9 @@
 /*
  * Error handling routines
  */
-svcerr_t error_scf(data_t **, data_t *, data_t *, const char *, const char *);
-svcerr_t internal_error(data_t **error, const char *msg);
+svcerr_t error_scf(adr_data_t **, adr_data_t *, adr_data_t *, const char *,
+    const char *);
+svcerr_t internal_error(adr_data_t **error, const char *msg);
 svcerr_t smfu_maperr(scf_error_t);
 
 typedef svcerr_t (*svc_callback_t)(scf_handle_t *, scf_service_t *,
@@ -125,7 +126,7 @@
 scf_error_t smfu_value_get_string(scf_value_t *val, char **strp);
 svcerr_t smfu_instance_get_composed_pg(scf_handle_t *handle,
     scf_instance_t *instance, const char *snapname, const char *pgname,
-    scf_propertygroup_t *pg, data_t **error);
+    scf_propertygroup_t *pg, adr_data_t **error);
 scf_error_t smfu_instance_iter_composed_pgs(scf_handle_t *handle,
     scf_instance_t *instance, const char *snapname, const char *pgtype,
     scf_iter_t *iter);
@@ -137,7 +138,7 @@
  * Operate on directly-attached property groups.
  */
 svcerr_t smfu_get_pg(smfu_entity_t *entity, const char *name,
-    scf_propertygroup_t *pg, data_t **);
+    scf_propertygroup_t *pg, adr_data_t **);
 svcerr_t smfu_iter_pg(smfu_entity_t *entity, const char *type,
     scf_iter_t *iter);
 
@@ -168,12 +169,13 @@
 /* A frequently used lexical scope surrogate */
 typedef struct radarg {
 	rad_instance_t *inst;
-	data_t **args;
+	adr_data_t **args;
 } radarg_t;
 
-typedef svcerr_t (*smfu_rtfunc_t)(scf_handle_t *, void *, data_t **, data_t **);
-conerr_t smfu_rtrun(smfu_rtfunc_t, void *, data_t **, data_t **);
-conerr_t smfu_rtrun_opt(smfu_rtfunc_t, void *, data_t **, data_t **);
+typedef svcerr_t (*smfu_rtfunc_t)(scf_handle_t *, void *, adr_data_t **,
+    adr_data_t **);
+conerr_t smfu_rtrun(smfu_rtfunc_t, void *, adr_data_t **, adr_data_t **);
+conerr_t smfu_rtrun_opt(smfu_rtfunc_t, void *, adr_data_t **, adr_data_t **);
 
 void smfu_init();