X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=c683dd236fd973feb2b8aef3e3b0de51e2c891ac;hp=cd995fee2ff931da9d55d40f882555dc4e48058f;hb=270b8d75334a30d27b61d1382a36bb2450008799;hpb=2ae9f4d72d7907e8edda7d361a0eb84a86f1bab3

diff --git a/list.c b/list.c
index cd995fe..c683dd2 100644
--- a/list.c
+++ b/list.c
@@ -12,43 +12,7 @@
  * GNU General Public License for more details.
  */
 
-/* initialize a list head/item */
-static inline void uci_list_init(struct uci_list *ptr)
-{
-	ptr->prev = ptr;
-	ptr->next = ptr;
-}
-
-/* inserts a new list entry after a given entry */
-static inline void uci_list_insert(struct uci_list *list, struct uci_list *ptr)
-{
-	list->next->prev = ptr;
-	ptr->prev = list;
-	ptr->next = list->next;
-	list->next = ptr;
-}
-
-/* inserts a new list entry at the tail of the list */
-static inline void uci_list_add(struct uci_list *head, struct uci_list *ptr)
-{
-	/* NB: head->prev points at the tail */
-	uci_list_insert(head->prev, ptr);
-}
-
-static inline void uci_list_del(struct uci_list *ptr)
-{
-	struct uci_list *next, *prev;
-
-	next = ptr->next;
-	prev = ptr->prev;
-
-	prev->next = next;
-	next->prev = prev;
-
-	uci_list_init(ptr);
-}
-
-static inline void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
+static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
 {
 	struct uci_list *new_head = head;
 	struct uci_element *p = NULL;
@@ -72,7 +36,7 @@ static inline void uci_list_fixup(struct uci_list *ptr)
  * uci_alloc_generic allocates a new uci_element with payload
  * payload is appended to the struct to save memory and reduce fragmentation
  */
-static struct uci_element *
+__private struct uci_element *
 uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 {
 	struct uci_element *e;
@@ -98,7 +62,7 @@ done:
 	return e;
 }
 
-static void
+__private void
 uci_free_element(struct uci_element *e)
 {
 	if (e->name)
@@ -163,8 +127,24 @@ uci_alloc_list(struct uci_section *s, const char *name)
 	return o;
 }
 
+/* Based on an efficient hash function published by D. J. Bernstein */
+static unsigned int djbhash(unsigned int hash, char *str)
+{
+	int len = strlen(str);
+	int i;
+
+	/* initial value */
+	if (hash == ~0)
+		hash = 5381;
+
+	for(i = 0; i < len; i++) {
+		hash = ((hash << 5) + hash) + str[i];
+	}
+	return (hash & 0x7FFFFFFF);
+}
+
 /* fix up an unnamed section, e.g. after adding options to it */
-static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
+__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
 {
 	unsigned int hash = ~0;
 	struct uci_element *e;
@@ -244,12 +224,12 @@ uci_alloc_package(struct uci_context *ctx, const char *name)
 	p = uci_alloc_element(ctx, package, name, 0);
 	p->ctx = ctx;
 	uci_list_init(&p->sections);
-	uci_list_init(&p->history);
-	uci_list_init(&p->saved_history);
+	uci_list_init(&p->delta);
+	uci_list_init(&p->saved_delta);
 	return p;
 }
 
-static void
+__private void
 uci_free_package(struct uci_package **package)
 {
 	struct uci_element *e, *tmp;
@@ -263,11 +243,11 @@ uci_free_package(struct uci_package **package)
 	uci_foreach_element_safe(&p->sections, tmp, e) {
 		uci_free_section(uci_to_section(e));
 	}
-	uci_foreach_element_safe(&p->history, tmp, e) {
-		uci_free_history(uci_to_history(e));
+	uci_foreach_element_safe(&p->delta, tmp, e) {
+		uci_free_delta(uci_to_delta(e));
 	}
-	uci_foreach_element_safe(&p->saved_history, tmp, e) {
-		uci_free_history(uci_to_history(e));
+	uci_foreach_element_safe(&p->saved_delta, tmp, e) {
+		uci_free_delta(uci_to_delta(e));
 	}
 	uci_free_element(&p->e);
 	*package = NULL;
@@ -289,7 +269,7 @@ uci_free_any(struct uci_element **e)
 	*e = NULL;
 }
 
-static inline struct uci_element *
+__private struct uci_element *
 uci_lookup_list(struct uci_list *list, const char *name)
 {
 	struct uci_element *e;
@@ -407,10 +387,14 @@ uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
 
 	/* if the section name validates as a regular name, pass through
 	 * to the regular uci_lookup function call */
-	if (ptr->flags & UCI_LOOKUP_EXTENDED)
-		e = uci_lookup_ext_section(ctx, ptr);
-	else
+	if (ptr->flags & UCI_LOOKUP_EXTENDED) {
+		if (extended)
+			e = uci_lookup_ext_section(ctx, ptr);
+		else
+			UCI_THROW(ctx, UCI_ERR_INVAL);
+	} else {
 		e = uci_lookup_list(&ptr->p->sections, ptr->section);
+	}
 
 	if (!e)
 		goto abort;
@@ -437,46 +421,8 @@ notfound:
 	return 0;
 }
 
-int
-uci_fill_ptr(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_element *e, bool complete)
-{
-	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, ptr != NULL);
-	UCI_ASSERT(ctx, e != NULL);
-
-	memset(ptr, 0, sizeof(struct uci_ptr));
-	switch(e->type) {
-	case UCI_TYPE_OPTION:
-		ptr->o = uci_to_option(e);
-		goto fill_option;
-	case UCI_TYPE_SECTION:
-		ptr->s = uci_to_section(e);
-		goto fill_section;
-	case UCI_TYPE_PACKAGE:
-		ptr->p = uci_to_package(e);
-		goto fill_package;
-	default:
-		UCI_THROW(ctx, UCI_ERR_INVAL);
-	}
-
-fill_option:
-	ptr->option = ptr->o->e.name;
-	ptr->s = ptr->o->section;
-fill_section:
-	ptr->section = ptr->s->e.name;
-	ptr->p = ptr->s->package;
-fill_package:
-	ptr->package = ptr->p->e.name;
-
-	ptr->flags |= UCI_LOOKUP_DONE;
-	if (complete)
-		ptr->flags |= UCI_LOOKUP_COMPLETE;
-
-	return 0;
-}
-
-static struct uci_element *
-expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete)
+__private struct uci_element *
+uci_expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete)
 {
 	UCI_ASSERT(ctx, ptr != NULL);
 
@@ -510,8 +456,8 @@ static void uci_add_element_list(struct uci_context *ctx, struct uci_ptr *ptr, b
 	struct uci_package *p;
 
 	p = ptr->p;
-	if (!internal && p->has_history)
-		uci_add_history(ctx, &p->history, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value);
+	if (!internal && p->has_delta)
+		uci_add_delta(ctx, &p->delta, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value);
 
 	e = uci_alloc_generic(ctx, UCI_TYPE_ITEM, ptr->value, sizeof(struct uci_option));
 	uci_list_add(&ptr->o->v.list, &e->list);
@@ -519,7 +465,7 @@ static void uci_add_element_list(struct uci_context *ctx, struct uci_ptr *ptr, b
 
 int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 {
-	/* NB: UCI_INTERNAL use means without history tracking */
+	/* NB: UCI_INTERNAL use means without delta tracking */
 	bool internal = ctx->internal;
 	struct uci_element *e;
 	struct uci_package *p;
@@ -527,14 +473,14 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 
 	UCI_HANDLE_ERR(ctx);
 
-	e = expand_ptr(ctx, ptr, true);
+	e = uci_expand_ptr(ctx, ptr, true);
 	p = ptr->p;
 
 	UCI_ASSERT(ctx, ptr->s);
 	UCI_ASSERT(ctx, ptr->value);
 
-	if (!internal && p->has_history)
-		uci_add_history(ctx, &p->history, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value);
+	if (!internal && p->has_delta)
+		uci_add_delta(ctx, &p->delta, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value);
 
 	n = uci_strdup(ctx, ptr->value);
 	if (e->name)
@@ -555,9 +501,9 @@ int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
 	UCI_HANDLE_ERR(ctx);
 
 	uci_list_set_pos(&s->package->sections, &s->e.list, pos);
-	if (!ctx->internal && p->has_history) {
+	if (!ctx->internal && p->has_delta) {
 		sprintf(order, "%d", pos);
-		uci_add_history(ctx, &p->history, UCI_CMD_REORDER, s->e.name, NULL, order);
+		uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
 	}
 
 	return 0;
@@ -573,8 +519,8 @@ int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *
 	s = uci_alloc_section(p, type, NULL);
 	uci_fixup_section(ctx, s);
 	*res = s;
-	if (!internal && p->has_history)
-		uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
+	if (!internal && p->has_delta)
+		uci_add_delta(ctx, &p->delta, UCI_CMD_ADD, s->e.name, NULL, type);
 
 	return 0;
 }
@@ -588,13 +534,13 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 
 	UCI_HANDLE_ERR(ctx);
 
-	e = expand_ptr(ctx, ptr, true);
+	e = uci_expand_ptr(ctx, ptr, true);
 	p = ptr->p;
 
 	UCI_ASSERT(ctx, ptr->s);
 
-	if (!internal && p->has_history)
-		uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
+	if (!internal && p->has_delta)
+		uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
 
 	uci_free_any(&e);
 
@@ -608,14 +554,14 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 
 int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 {
-	/* NB: UCI_INTERNAL use means without history tracking */
+	/* NB: UCI_INTERNAL use means without delta tracking */
 	bool internal = ctx->internal;
 	struct uci_option *prev = NULL;
 	const char *value2 = NULL;
 
 	UCI_HANDLE_ERR(ctx);
 
-	expand_ptr(ctx, ptr, false);
+	uci_expand_ptr(ctx, ptr, false);
 	UCI_ASSERT(ctx, ptr->s);
 	UCI_ASSERT(ctx, ptr->value);
 
@@ -649,11 +595,11 @@ int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 
 int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
 {
-	/* NB: UCI_INTERNAL use means without history tracking */
+	/* NB: UCI_INTERNAL use means without delta tracking */
 	bool internal = ctx->internal;
 
 	UCI_HANDLE_ERR(ctx);
-	expand_ptr(ctx, ptr, false);
+	uci_expand_ptr(ctx, ptr, false);
 	UCI_ASSERT(ctx, ptr->value);
 	UCI_ASSERT(ctx, ptr->s || (!ptr->option && ptr->section));
 	if (!ptr->option && ptr->value[0]) {
@@ -702,8 +648,8 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
 		UCI_THROW(ctx, UCI_ERR_INVAL);
 	}
 
-	if (!internal && ptr->p->has_history)
-		uci_add_history(ctx, &ptr->p->history, UCI_CMD_CHANGE, ptr->section, ptr->option, ptr->value);
+	if (!internal && ptr->p->has_delta)
+		uci_add_delta(ctx, &ptr->p->delta, UCI_CMD_CHANGE, ptr->section, ptr->option, ptr->value);
 
 	return 0;
 }