* GNU Lesser General Public License for more details.
*/
-static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
+static bool uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
{
+ struct uci_list *old_head = ptr->prev;
struct uci_list *new_head = head;
struct uci_element *p = NULL;
}
uci_list_add(new_head->next, ptr);
+
+ return (old_head != new_head);
}
static inline void uci_list_fixup(struct uci_list *ptr)
}
/* fix up an unnamed section, e.g. after adding options to it */
-__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
+static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
{
unsigned int hash = ~0;
struct uci_element *e;
char buf[16];
- if (!s || !s->anonymous)
+ if (!s || s->e.name)
return;
/*
break;
}
}
- sprintf(buf, "cfg%02x%04x", s->package->name_index, hash % (1 << 16));
+ sprintf(buf, "cfg%02x%04x", s->package->n_section, hash % (1 << 16));
s->e.name = uci_strdup(ctx, buf);
}
struct uci_element *e;
uci_foreach_element(list, e) {
- if (e->name && !strcmp(e->name, name))
+ if (!strcmp(e->name, name))
return e;
}
return NULL;
{
struct uci_package *p = s->package;
bool internal = ctx && ctx->internal;
+ bool changed = false;
char order[32];
UCI_HANDLE_ERR(ctx);
- uci_list_set_pos(&s->package->sections, &s->e.list, pos);
- if (!internal && p->has_delta) {
+ changed = uci_list_set_pos(&s->package->sections, &s->e.list, pos);
+ if (!internal && p->has_delta && changed) {
sprintf(order, "%d", pos);
uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
}
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);
s = uci_alloc_section(p, type, NULL);
- uci_fixup_section(ctx, s);
+ if (s && s->anonymous)
+ uci_fixup_section(ctx, s);
*res = s;
if (!internal && p->has_delta)
uci_add_delta(ctx, &p->delta, UCI_CMD_ADD, s->e.name, NULL, type);