aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2015-03-02 21:36:45 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2015-03-02 21:36:45 +0000
commit15b8b407ee0ee485e82a9de35932da2053f2c390 (patch)
tree706eda60dcf535acdb5490ad71d8414b636c0282
parent513f8791d85bbaf75cea6a942f689a9fc128805e (diff)
downloadsrc-15b8b407ee0ee485e82a9de35932da2053f2c390.tar.gz
src-15b8b407ee0ee485e82a9de35932da2053f2c390.zip
Really update to 8d3b186vendor/libucl/20150302
Notes
Notes: svn path=/vendor/libucl/dist/; revision=279547 svn path=/vendor/libucl/20150302/; revision=279548; tag=vendor/libucl/20150302
-rw-r--r--utils/objdump.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/objdump.c b/utils/objdump.c
index d3f7cd1bcec6..74581baafddb 100644
--- a/utils/objdump.c
+++ b/utils/objdump.c
@@ -46,7 +46,7 @@ ucl_obj_dump (const ucl_object_t *obj, unsigned int shift)
if (obj->key != NULL) {
printf ("%skey: \"%s\"\n", pre, ucl_object_key (obj));
}
- printf ("%sref: %hd\n", pre, obj->ref);
+ printf ("%sref: %u\n", pre, obj->ref);
printf ("%slen: %u\n", pre, obj->len);
printf ("%sprev: %p\n", pre, obj->prev);
printf ("%snext: %p\n", pre, obj->next);
@@ -61,7 +61,10 @@ ucl_obj_dump (const ucl_object_t *obj, unsigned int shift)
else if (obj->type == UCL_ARRAY) {
printf ("%stype: UCL_ARRAY\n", pre);
printf ("%svalue: %p\n", pre, obj->value.av);
- ucl_obj_dump (obj->value.av, shift + 2);
+ it_obj = NULL;
+ while ((cur = ucl_iterate_object (obj, &it_obj, true))) {
+ ucl_obj_dump (cur, shift + 2);
+ }
}
else if (obj->type == UCL_INT) {
printf ("%stype: UCL_INT\n", pre);
@@ -96,7 +99,7 @@ int
main(int argc, char **argv)
{
const char *fn = NULL;
- char inbuf[8192];
+ unsigned char inbuf[8192];
struct ucl_parser *parser;
int k, ret = 0, r = 0;
ucl_object_t *obj = NULL;