projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uci/lua: add explicit close() method
[project/uci.git]
/
list.c
diff --git
a/list.c
b/list.c
index
863c48c
..
2b859a6
100644
(file)
--- a/
list.c
+++ b/
list.c
@@
-33,7
+33,7
@@
static inline void uci_list_fixup(struct uci_list *ptr)
ptr->next->prev = ptr;
}
ptr->next->prev = ptr;
}
-/*
+/*
* uci_alloc_generic allocates a new uci_element with payload
* payload is appended to the struct to save memory and reduce fragmentation
*/
* uci_alloc_generic allocates a new uci_element with payload
* payload is appended to the struct to save memory and reduce fragmentation
*/
@@
-150,7
+150,7
@@
__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
struct uci_element *e;
char buf[16];
struct uci_element *e;
char buf[16];
- if (!s ||
s->e.name
)
+ if (!s ||
!s->anonymous
)
return;
/*
return;
/*
@@
-175,7
+175,7
@@
__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
break;
}
}
break;
}
}
- sprintf(buf, "cfg%02x%04x",
++s->package->n_section
, hash % (1 << 16));
+ sprintf(buf, "cfg%02x%04x",
s->package->name_index
, hash % (1 << 16));
s->e.name = uci_strdup(ctx, buf);
}
s->e.name = uci_strdup(ctx, buf);
}
@@
-274,7
+274,7
@@
uci_lookup_list(struct uci_list *list, const char *name)
struct uci_element *e;
uci_foreach_element(list, e) {
struct uci_element *e;
uci_foreach_element(list, e) {
- if (!strcmp(e->name, name))
+ if (
e->name &&
!strcmp(e->name, name))
return e;
}
return NULL;
return e;
}
return NULL;
@@
-318,7
+318,7
@@
uci_lookup_ext_section(struct uci_context *ctx, struct uci_ptr *ptr)
else if (!uci_validate_type(name))
goto error;
else if (!uci_validate_type(name))
goto error;
- /* if the given index is negative, it specifies the section number from
+ /* if the given index is negative, it specifies the section number from
* the end of the list */
if (idx < 0) {
c = 0;
* the end of the list */
if (idx < 0) {
c = 0;
@@
-346,7
+346,7
@@
uci_lookup_ext_section(struct uci_context *ctx, struct uci_ptr *ptr)
goto done;
error:
goto done;
error:
-
e = NULL
;
+
free(section)
;
memset(ptr, 0, sizeof(struct uci_ptr));
UCI_THROW(ctx, UCI_ERR_INVAL);
done:
memset(ptr, 0, sizeof(struct uci_ptr));
UCI_THROW(ctx, UCI_ERR_INVAL);
done:
@@
-431,11
+431,12
@@
uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
complete:
ptr->flags |= UCI_LOOKUP_COMPLETE;
abort:
complete:
ptr->flags |= UCI_LOOKUP_COMPLETE;
abort:
- return
0
;
+ return
UCI_OK
;
notfound:
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
notfound:
UCI_THROW(ctx, UCI_ERR_NOTFOUND);
- return 0;
+ /* not a chance here */
+ return UCI_ERR_NOTFOUND;
}
__private struct uci_element *
}
__private struct uci_element *