ptr->next->prev = ptr;
}
-/*
+/*
* uci_alloc_generic allocates a new uci_element with payload
* payload is appended to the struct to save memory and reduce fragmentation
*/
__private void
uci_free_element(struct uci_element *e)
{
- if (e->name)
- free(e->name);
+ free(e->name);
if (!uci_list_empty(&e->list))
uci_list_del(&e->list);
free(e);
if(!p)
return;
- if (p->path)
- free(p->path);
+ free(p->path);
uci_foreach_element_safe(&p->sections, tmp, e) {
uci_free_section(uci_to_section(e));
}
else if (!uci_validate_type(name))
goto error;
- /* if the given index is negative, it specifies the section number from
+ /* if the given index is negative, it specifies the section number from
* the end of the list */
if (idx < 0) {
c = 0;
uci_add_delta(ctx, &p->delta, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value);
n = uci_strdup(ctx, ptr->value);
- if (e->name)
- free(e->name);
+ free(e->name);
e->name = n;
if (e->type == UCI_TYPE_SECTION)
int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
{
struct uci_package *p = s->package;
+ bool internal = ctx && ctx->internal;
char order[32];
UCI_HANDLE_ERR(ctx);
uci_list_set_pos(&s->package->sections, &s->e.list, pos);
- if (!ctx->internal && p->has_delta) {
+ if (!internal && p->has_delta) {
sprintf(order, "%d", pos);
uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
}
UCI_ASSERT(ctx, ptr->s);
- if (ptr->value && ptr->o && ptr->o->type == UCI_TYPE_LIST) {
+ if (ptr->o && ptr->o->type == UCI_TYPE_LIST && ptr->value && *ptr->value) {
if (!sscanf(ptr->value, "%d", &index))
return 1;