X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci_internal.h;h=61f2da2ab337bc89cf9278f3cb26171d686428b1;hp=89863f1fec7bc3645ca8a6c688737d7e74cbdc6f;hb=021fd65643a7932dc67ebeb2291264e308432428;hpb=f8f9decc545a7e9fc7b4c92534f4bf2b1db4a4f0 diff --git a/uci_internal.h b/uci_internal.h index 89863f1..61f2da2 100644 --- a/uci_internal.h +++ b/uci_internal.h @@ -47,7 +47,7 @@ extern const char *uci_savedir; __private void *uci_malloc(struct uci_context *ctx, size_t size); __private void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size); __private char *uci_strdup(struct uci_context *ctx, const char *str); -__private bool uci_validate_str(const char *str, bool name); +__private bool uci_validate_str(const char *str, bool name, bool package); __private void uci_add_delta(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value); __private void uci_free_delta(struct uci_delta *h); __private struct uci_package *uci_alloc_package(struct uci_context *ctx, const char *name); @@ -61,7 +61,6 @@ __private void uci_alloc_parse_context(struct uci_context *ctx); __private void uci_cleanup(struct uci_context *ctx); __private struct uci_element *uci_lookup_list(struct uci_list *list, const char *name); -__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s); __private void uci_free_package(struct uci_package **package); __private struct uci_element *uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size); __private void uci_free_element(struct uci_element *e); @@ -71,17 +70,17 @@ __private int uci_load_delta(struct uci_context *ctx, struct uci_package *p, boo static inline bool uci_validate_package(const char *str) { - return uci_validate_str(str, false); + return uci_validate_str(str, false, true); } static inline bool uci_validate_type(const char *str) { - return uci_validate_str(str, false); + return uci_validate_str(str, false, false); } static inline bool uci_validate_name(const char *str) { - return uci_validate_str(str, true); + return uci_validate_str(str, true, false); } /* initialize a list head/item */