UCI_THROW(ctx, UCI_ERR_IO);
}
}
- if (filename)
- free(filename);
+ free(filename);
uci_close_stream(f);
ctx->err = 0;
return changes;
if (!buf[0])
continue;
- /* NB: need to allocate the element before the call to
- * uci_parse_delta_tuple, otherwise the original string
+ /* NB: need to allocate the element before the call to
+ * uci_parse_delta_tuple, otherwise the original string
* gets modified before it is saved */
e = uci_alloc_generic(ctx, UCI_TYPE_DELTA, pctx->buf, sizeof(struct uci_element));
uci_list_add(&list, &e->list);
UCI_TRAP_RESTORE(ctx);
done:
- if (filename)
- free(filename);
+ free(filename);
uci_close_stream(pctx->file);
uci_foreach_element_safe(&list, tmp, e) {
uci_free_element(e);
uci_expand_ptr(ctx, ptr, false);
UCI_ASSERT(ctx, ptr->p->has_delta);
- /*
+ /*
* - flush unwritten changes
* - save the package name
* - unload the package
UCI_TRAP_SAVE(ctx, error);
UCI_INTERNAL(uci_save, ctx, ptr->p);
- /* NB: need to clone package, section and option names,
+ /* NB: need to clone package, section and option names,
* as they may get freed on uci_free_package() */
package = uci_strdup(ctx, ptr->p->e.name);
if (ptr->section)
ctx->err = 0;
error:
- if (package)
- free(package);
- if (section)
- free(section);
- if (option)
- free(option);
+ free(package);
+ free(section);
+ free(option);
if (ctx->err)
UCI_THROW(ctx, ctx->err);
return 0;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);
- /*
+ /*
* if the config file was outside of the /etc/config path,
* don't save the delta to a file, update the real file
* directly.
done:
uci_close_stream(f);
- if (filename)
- free(filename);
+ free(filename);
if (ctx->err)
UCI_THROW(ctx, ctx->err);