more cleanup/list fixes

[project/uci.git] / libuci.h

diff --git a/libuci.h b/libuci.h
index 3427526..de96f45 100644 (file)
--- a/libuci.h
+++ b/libuci.h
@@ -81,6 +81,8 @@ struct uci_context
        /* private: */
        int errno;
        jmp_buf trap;
+       jmp_buf trap_saved;
+       int saved;
 };
 
 struct uci_parse_context
@@ -89,6 +91,7 @@ struct uci_parse_context
        int byte;
 
        /* private: */
+       struct uci_config *cfg;
        FILE *file;
        char *buf;
        int bufsz;
@@ -124,12 +127,13 @@ struct uci_option
 #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
 #endif
 
-#define uci_list_entry(type, ptr) \
-       ((struct uci_#type *) ((char *)(ptr) - offsetof(struct uci_#type,list)))
+#define uci_list_empty(list) (list->next == ptr)
+#define uci_list_entry(_type, _ptr) \
+       ((struct uci_ ## _type *) ((char *)(_ptr) - offsetof(struct uci_ ## _type,list)))
 
-#define uci_foreach_entry(type, list, ptr)             \
-       for(ptr = uci_list_entry(type, (list)->next);   \
-               &ptr->list != list;                     \
-               ptr = uci_list_entry(type, ptr->list.next))
+#define uci_foreach_entry(_type, _list, _ptr)          \
+       for(_ptr = uci_list_entry(_type, (_list)->next);        \
+               &_ptr->list != (_list);                 \
+               _ptr = uci_list_entry(_type, _ptr->list.next))
 
 #endif