projects
/
project
/
uci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5dd8939
)
improve error handling
author
Felix Fietkau
<nbd@openwrt.org>
Tue, 12 Feb 2008 11:22:02 +0000
(12:22 +0100)
committer
Felix Fietkau
<nbd@openwrt.org>
Tue, 12 Feb 2008 11:22:02 +0000
(12:22 +0100)
file.c
patch
|
blob
|
history
diff --git
a/file.c
b/file.c
index
29ff318
..
d320ba6
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-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: