projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
constify
[project/uci.git]
/
file.c
diff --git
a/file.c
b/file.c
index
5360ef7
..
13fdd3b
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-128,7
+128,7
@@
static void uci_parse_config(struct uci_context *ctx, char **str)
UCI_TRAP_RESTORE(ctx);
return;
error:
UCI_TRAP_RESTORE(ctx);
return;
error:
- UCI_THROW(ctx, ctx->err
no
);
+ UCI_THROW(ctx, ctx->err);
} else
pctx->section = uci_alloc_section(pctx->package, type, name);
}
} else
pctx->section = uci_alloc_section(pctx->package, type, name);
}
@@
-158,7
+158,7
@@
static void uci_parse_option(struct uci_context *ctx, char **str)
UCI_TRAP_RESTORE(ctx);
return;
error:
UCI_TRAP_RESTORE(ctx);
return;
error:
- UCI_THROW(ctx, ctx->err
no
);
+ UCI_THROW(ctx, ctx->err);
} else
uci_alloc_option(pctx->section, name, value);
}
} else
uci_alloc_option(pctx->section, name, value);
}
@@
-323,9
+323,9
@@
int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
error:
if (ctx->flags & UCI_FLAG_PERROR)
uci_perror(ctx, NULL);
error:
if (ctx->flags & UCI_FLAG_PERROR)
uci_perror(ctx, NULL);
- if ((ctx->err
no
!= UCI_ERR_PARSE) ||
+ if ((ctx->err != UCI_ERR_PARSE) ||
(ctx->flags & UCI_FLAG_STRICT))
(ctx->flags & UCI_FLAG_STRICT))
- UCI_THROW(ctx, ctx->err
no
);
+ UCI_THROW(ctx, ctx->err);
}
uci_fixup_section(ctx, ctx->pctx->section);
}
uci_fixup_section(ctx, ctx->pctx->section);
@@
-421,8
+421,8
@@
done:
if (path)
free(path);
uci_close_stream(f);
if (path)
free(path);
uci_close_stream(f);
- if (ctx->err
no
)
- UCI_THROW(ctx, ctx->err
no
);
+ if (ctx->err)
+ UCI_THROW(ctx, ctx->err);
}
}
@@
-511,7
+511,7
@@
static struct uci_package *uci_file_load(struct uci_context *ctx, const char *na
}
file = uci_open_stream(ctx, filename, SEEK_SET, false, false);
}
file = uci_open_stream(ctx, filename, SEEK_SET, false, false);
- ctx->err
no
= 0;
+ ctx->err = 0;
UCI_TRAP_SAVE(ctx, done);
UCI_INTERNAL(uci_import, ctx, file, name, &package, true);
UCI_TRAP_RESTORE(ctx);
UCI_TRAP_SAVE(ctx, done);
UCI_INTERNAL(uci_import, ctx, file, name, &package, true);
UCI_TRAP_RESTORE(ctx);
@@
-524,8
+524,8
@@
static struct uci_package *uci_file_load(struct uci_context *ctx, const char *na
done:
uci_close_stream(file);
done:
uci_close_stream(file);
- if (ctx->err
no
)
- UCI_THROW(ctx, ctx->err
no
);
+ if (ctx->err)
+ UCI_THROW(ctx, ctx->err);
return package;
}
return package;
}