+/*
+ * Copyright (C) 2013 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
#include <libubox/avl.h>
#include <libubox/avl-cmp.h>
#include "utils.h"
void
-__blobmsg_list_init(struct blobmsg_list *list, int offset, int len)
+__blobmsg_list_init(struct blobmsg_list *list, int offset, int len, blobmsg_list_cmp cmp)
{
avl_init(&list->avl, avl_strcmp, false, NULL);
list->node_offset = offset;
list->node_len = len;
+ list->cmp = cmp;
}
int
-blobmsg_list_fill(struct blobmsg_list *list, void *data, int len)
+blobmsg_list_fill(struct blobmsg_list *list, void *data, int len, bool array)
{
struct avl_tree *tree = &list->avl;
struct blobmsg_list_node *node;
int rem = len;
__blob_for_each_attr(cur, data, rem) {
- if (!blobmsg_check_attr(cur, true))
+ if (!blobmsg_check_attr(cur, !array))
continue;
ptr = calloc(1, list->node_len);
return -1;
node = (void *) ((char *)ptr + list->node_offset);
- node->avl.key = blobmsg_name(cur);
+ if (array)
+ node->avl.key = blobmsg_data(cur);
+ else
+ node->avl.key = blobmsg_name(cur);
node->data = cur;
if (avl_insert(tree, &node->avl)) {
free(ptr);
void *ptr;
avl_remove_all_elements(&src->avl, node, avl, tmp) {
- if (!avl_insert(&list->avl, &node->avl)) {
+ if (avl_insert(&list->avl, &node->avl)) {
ptr = ((char *) node - list->node_offset);
free(ptr);
}
if (memcmp(n1->data, n2->data, len) != 0)
return false;
+ if (l1->cmp && !l1->cmp(n1, n2))
+ return false;
+
if (!count)
break;