mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 13:48:06 +00:00
uci: use latest git, fixes reorder operation and incorperates nested delete patch
SVN-Revision: 25048
This commit is contained in:
parent
4d465f4036
commit
9500602457
@ -7,13 +7,13 @@
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
UCI_VERSION=2010-09-28
|
||||
UCI_RELEASE=2
|
||||
UCI_VERSION=2011-01-19
|
||||
UCI_RELEASE=1
|
||||
|
||||
PKG_NAME:=uci
|
||||
PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE))
|
||||
PKG_RELEASE:=2
|
||||
PKG_REV:=3fa65a20ae0fc77b951515bc5de7a0041adc9be1
|
||||
PKG_RELEASE:=1
|
||||
PKG_REV:=a5eb996e0f04d911ff61479508bbc3e17b16ff0c
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=git://nbd.name/uci.git
|
||||
|
@ -1,20 +0,0 @@
|
||||
--- a/lua/uci.c
|
||||
+++ b/lua/uci.c
|
||||
@@ -266,7 +266,7 @@ uci_lua_foreach(lua_State *L)
|
||||
{
|
||||
struct uci_context *ctx;
|
||||
struct uci_package *p;
|
||||
- struct uci_element *e;
|
||||
+ struct uci_element *e, *tmp;
|
||||
const char *package, *type;
|
||||
bool ret = false;
|
||||
int offset = 0;
|
||||
@@ -287,7 +287,7 @@ uci_lua_foreach(lua_State *L)
|
||||
if (!p)
|
||||
goto done;
|
||||
|
||||
- uci_foreach_element(&p->sections, e) {
|
||||
+ uci_foreach_element_safe(&p->sections, tmp, e) {
|
||||
struct uci_section *s = uci_to_section(e);
|
||||
|
||||
i++;
|
Loading…
Reference in New Issue
Block a user