X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=uci.h;h=6d13ea6c5f5d0ba2696ae8352dd5c08c5c7eab48;hp=d83da52c1794583d09d39617e1ff44cfe58f5be6;hb=d3722382bdd467d1c705911450120be75426406f;hpb=fcb93b2ca79dbddd7a8754f65d72b78c4d6c13b5

diff --git a/uci.h b/uci.h
index d83da52..6d13ea6 100644
--- a/uci.h
+++ b/uci.h
@@ -9,12 +9,16 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  */
 
 #ifndef __LIBUCI_H
 #define __LIBUCI_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "uci_config.h"
 
 /*
@@ -29,6 +33,7 @@
 #include <stdbool.h>
 #include <setjmp.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #define UCI_CONFDIR "/etc/config"
 #define UCI_SAVEDIR "/tmp/.uci"
@@ -65,6 +70,7 @@ struct uci_option;
 struct uci_delta;
 struct uci_context;
 struct uci_backend;
+struct uci_parse_option;
 struct uci_parse_context;
 
 
@@ -344,6 +350,23 @@ int uci_parse_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str);
  */
 int uci_lookup_next(struct uci_context *ctx, struct uci_element **e, struct uci_list *list, const char *name);
 
+/**
+ * uci_parse_section: look up a set of options
+ * @s: uci section
+ * @opts: list of options to look up
+ * @n_opts: number of options to look up
+ * @tb: array of pointers to found options
+ */
+void uci_parse_section(struct uci_section *s, const struct uci_parse_option *opts,
+		       int n_opts, struct uci_option **tb);
+
+/**
+ * uci_hash_options: build a hash over a list of options
+ * @tb: list of option pointers
+ * @n_opts: number of options
+ */
+uint32_t uci_hash_options(struct uci_option **tb, int n_opts);
+
 
 /* UCI data structures */
 enum uci_type {
@@ -521,6 +544,11 @@ struct uci_plugin
 	void *dlh;
 };
 
+struct uci_parse_option {
+	const char *name;
+	enum uci_option_type type;
+};
+
 
 /* linked list handling */
 #ifndef offsetof
@@ -662,6 +690,8 @@ uci_lookup_package(struct uci_context *ctx, const char *name)
 	struct uci_element *e = NULL;
 	if (uci_lookup_next(ctx, &e, &ctx->root, name) == 0)
 		return uci_to_package(e);
+	else
+		return NULL;
 }
 
 /**
@@ -676,6 +706,8 @@ uci_lookup_section(struct uci_context *ctx, struct uci_package *p, const char *n
 	struct uci_element *e = NULL;
 	if (uci_lookup_next(ctx, &e, &p->sections, name) == 0)
 		return uci_to_section(e);
+	else
+		return NULL;
 }
 
 /**
@@ -690,6 +722,24 @@ uci_lookup_option(struct uci_context *ctx, struct uci_section *s, const char *na
 	struct uci_element *e = NULL;
 	if (uci_lookup_next(ctx, &e, &s->options, name) == 0)
 		return uci_to_option(e);
+	else
+		return NULL;
+}
+
+static inline const char *
+uci_lookup_option_string(struct uci_context *ctx, struct uci_section *s, const char *name)
+{
+	struct uci_option *o;
+
+	o = uci_lookup_option(ctx, s, name);
+	if (!o || o->type != UCI_TYPE_STRING)
+		return NULL;
+
+	return o->v.string;
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif