From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 3 Jul 2014 10:56:40 +0000 (+0200)
Subject: blobmsg_example: fix output
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8cee1e552ab281dbbf0f862e4e4e327028c0399b;p=oweals%2Flibubox.git

blobmsg_example: fix output

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/examples/blobmsg-example.c b/examples/blobmsg-example.c
index 86501e2..d306f07 100644
--- a/examples/blobmsg-example.c
+++ b/examples/blobmsg-example.c
@@ -11,7 +11,7 @@ static const char *indent_str = "\t\t\t\t\t\t\t\t\t\t\t\t\t";
 	fprintf(stderr, __VA_ARGS__); \
 } while(0)
 
-static void dump_attr_data(void *data, int len, int type, int indent, int next_indent);
+static void dump_attr_data(struct blob_attr *data, int indent, int next_indent);
 
 static void
 dump_table(struct blob_attr *head, int len, int indent, bool array)
@@ -24,34 +24,36 @@ dump_table(struct blob_attr *head, int len, int indent, bool array)
 		hdr = blob_data(attr);
 		if (!array)
 			indent_printf(indent + 1, "%s : ", hdr->name);
-		dump_attr_data(blobmsg_data(attr), blobmsg_data_len(attr), blob_id(attr), 0, indent + 1);
+		dump_attr_data(attr, 0, indent + 1);
 	}
 	indent_printf(indent, "}\n");
 }
 
-static void dump_attr_data(void *data, int len, int type, int indent, int next_indent)
+static void dump_attr_data(struct blob_attr *data, int indent, int next_indent)
 {
+	int type = blobmsg_type(data);
 	switch(type) {
 	case BLOBMSG_TYPE_STRING:
-		indent_printf(indent, "%s\n", (char *) data);
+		indent_printf(indent, "%s\n", blobmsg_data(data));
 		break;
 	case BLOBMSG_TYPE_INT8:
-		indent_printf(indent, "%d\n", *(uint8_t *)data);
+		indent_printf(indent, "%d\n", blobmsg_get_u8(data));
 		break;
 	case BLOBMSG_TYPE_INT16:
-		indent_printf(indent, "%d\n", *(uint16_t *)data);
+		indent_printf(indent, "%d\n", blobmsg_get_u16(data));
 		break;
 	case BLOBMSG_TYPE_INT32:
-		indent_printf(indent, "%d\n", *(uint32_t *)data);
+		indent_printf(indent, "%d\n", blobmsg_get_u32(data));
 		break;
 	case BLOBMSG_TYPE_INT64:
-		indent_printf(indent, "%"PRIu64"\n", *(uint64_t *)data);
+		indent_printf(indent, "%"PRIu64"\n", blobmsg_get_u64(data));
 		break;
 	case BLOBMSG_TYPE_TABLE:
 	case BLOBMSG_TYPE_ARRAY:
 		if (!indent)
 			indent_printf(indent, "\n");
-		dump_table(data, len, next_indent, type == BLOBMSG_TYPE_ARRAY);
+		dump_table(blobmsg_data(data), blobmsg_data_len(data),
+			   next_indent, type == BLOBMSG_TYPE_ARRAY);
 		break;
 	}
 }
@@ -128,7 +130,7 @@ int main(int argc, char **argv)
 	blobmsg_buf_init(&buf);
 	fill_message(&buf);
 	dump_message(&buf);
-	fprintf(stderr, "json: %s\n", blobmsg_format_json(buf.head, false));
+	fprintf(stderr, "json: %s\n", blobmsg_format_json(buf.head, true));
 
 	if (buf.buf)
 		free(buf.buf);