From 1a388b01f8c85a8a8b987789096d1f9e86b29fdf Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 5 Sep 2008 21:51:46 +0200 Subject: overhaul package and section type validation - makes it easier to read and fixes some bugs in uci changes and uci show without explicit package references --- util.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'util.c') diff --git a/util.c b/util.c index 177bd14..e56992e 100644 --- a/util.c +++ b/util.c @@ -96,6 +96,16 @@ __plugin bool uci_validate_str(const char *str, bool name) return true; } +static inline bool uci_validate_package(const char *str) +{ + return uci_validate_str(str, false); +} + +static inline bool uci_validate_type(const char *str) +{ + return uci_validate_str(str, false); +} + static inline bool uci_validate_name(const char *str) { return uci_validate_str(str, true); @@ -159,7 +169,7 @@ int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str) goto error; lastval: - if (ptr->package && !uci_validate_str(ptr->package, false)) + if (ptr->package && !uci_validate_package(ptr->package)) goto error; if (ptr->section && !uci_validate_name(ptr->section)) ptr->flags |= UCI_LOOKUP_EXTENDED; -- cgit v1.2.1