MFC: r263648, r264789, r266636

This brings:
- schema validation
- xpath-like interface for ucl objects

Adapt pkg(7) to the new libucl API

2 files changed, 6 insertions, 6 deletions

diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index e46da4a..fded95e 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -517,10 +517,10 @@ boolstr_to_bool(const char *str)
 }
 
 static void
-config_parse(ucl_object_t *obj, pkg_conf_file_t conftype)
+config_parse(const ucl_object_t *obj, pkg_conf_file_t conftype)
 {
 	struct sbuf *buf = sbuf_new_auto();
-	ucl_object_t *cur, *seq;
+	const ucl_object_t *cur, *seq;
 	ucl_object_iter_t it = NULL, itseq = NULL;
 	struct config_entry *temp_config;
 	struct config_value *cv;
@@ -638,7 +638,7 @@ static void
 parse_repo_file(ucl_object_t *obj)
 {
 	ucl_object_iter_t it = NULL;
-	ucl_object_t *cur;
+	const ucl_object_t *cur;
 	const char *key;
 
 	while ((cur = ucl_iterate_object(obj, &it, true))) {
@@ -683,7 +683,7 @@ read_conf_file(const char *confpath, pkg_conf_file_t conftype)
 			parse_repo_file(obj);
 	}
 
-	ucl_object_free(obj);
+	ucl_object_unref(obj);
 	ucl_parser_free(p);
 
 	return (0);
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index 6208121..fa3d91e 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -273,7 +273,7 @@ cleanup:
 static struct fingerprint *
 parse_fingerprint(ucl_object_t *obj)
 {
-	ucl_object_t *cur;
+	const ucl_object_t *cur;
 	ucl_object_iter_t it = NULL;
 	const char *function, *fp, *key;
 	struct fingerprint *f;
@@ -353,7 +353,7 @@ load_fingerprint(const char *dir, const char *filename)
 	if (f != NULL)
 		f->name = strdup(filename);
 
-	ucl_object_free(obj);
+	ucl_object_unref(obj);
 	ucl_parser_free(p);
 
 	return (f);