projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
consistency
[project/uci.git]
/
file.c
diff --git
a/file.c
b/file.c
index
883e360
..
d320ba6
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-69,7
+69,7
@@
static void uci_switch_config(struct uci_context *ctx)
* if an older config under the same name exists, unload it
* ignore errors here, e.g. if the config was not found
*/
* if an older config under the same name exists, unload it
* ignore errors here, e.g. if the config was not found
*/
- e = uci_lookup_list(
ctx,
&ctx->root, name);
+ e = uci_lookup_list(&ctx->root, name);
if (e)
UCI_THROW(ctx, UCI_ERR_DUPLICATE);
pctx->package = uci_alloc_package(ctx, name);
if (e)
UCI_THROW(ctx, UCI_ERR_DUPLICATE);
pctx->package = uci_alloc_package(ctx, name);
@@
-122,7
+122,8
@@
static void uci_parse_config(struct uci_context *ctx, char **str)
if (pctx->merge) {
UCI_TRAP_SAVE(ctx, error);
if (pctx->merge) {
UCI_TRAP_SAVE(ctx, error);
- uci_set(ctx, pctx->package, name, NULL, type, NULL);
+ if (uci_set(ctx, pctx->package, name, NULL, type, NULL) != UCI_OK)
+ goto error;
UCI_TRAP_RESTORE(ctx);
return;
error:
UCI_TRAP_RESTORE(ctx);
return;
error: