remove internal usage of redundant uci_ptr.last

[project/uci.git] / uci_internal.h

diff --git a/uci_internal.h b/uci_internal.h
index b4e62ffb973714588cfcbbd00c40353873fcf299..ff4ee8cbb18c9a3e1813230dab99187fc3698124 100644 (file)
--- a/uci_internal.h
+++ b/uci_internal.h
@@ -23,7 +23,7 @@ struct uci_parse_context
        /* error context */
        const char *reason;
        int line;
-       int byte;
+       size_t byte;
 
        /* private: */
        struct uci_package *package;
@@ -32,8 +32,18 @@ struct uci_parse_context
        FILE *file;
        const char *name;
        char *buf;
-       int bufsz;
+       size_t bufsz;
+       size_t buf_filled;
+       size_t pos;
 };
+#define pctx_pos(pctx)         ((pctx)->pos)
+#define pctx_str(pctx, i)      (&(pctx)->buf[(i)])
+#define pctx_cur_str(pctx)     pctx_str(pctx, pctx_pos(pctx))
+#define pctx_char(pctx, i)     ((pctx)->buf[(i)])
+#define pctx_cur_char(pctx)    pctx_char(pctx, pctx_pos(pctx))
+
+#define uci_alloc_element(ctx, type, name, datasize) \
+       uci_to_ ## type (uci_alloc_generic(ctx, uci_type_ ## type, name, sizeof(struct uci_ ## type) + datasize))
 
 extern const char *uci_confdir;
 extern const char *uci_savedir;
@@ -41,21 +51,20 @@ extern const char *uci_savedir;
 __private void *uci_malloc(struct uci_context *ctx, size_t size);
 __private void *uci_realloc(struct uci_context *ctx, void *ptr, size_t size);
 __private char *uci_strdup(struct uci_context *ctx, const char *str);
-__private bool uci_validate_str(const char *str, bool name);
+__private bool uci_validate_str(const char *str, bool name, bool package);
 __private void uci_add_delta(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value);
 __private void uci_free_delta(struct uci_delta *h);
 __private struct uci_package *uci_alloc_package(struct uci_context *ctx, const char *name);
 
 __private FILE *uci_open_stream(struct uci_context *ctx, const char *filename, const char *origfilename, int pos, bool write, bool create);
 __private void uci_close_stream(FILE *stream);
-__private void uci_getln(struct uci_context *ctx, int offset);
+__private void uci_getln(struct uci_context *ctx, size_t offset);
 
-__private void uci_parse_error(struct uci_context *ctx, char *pos, char *reason);
+__private void uci_parse_error(struct uci_context *ctx, char *reason);
 __private void uci_alloc_parse_context(struct uci_context *ctx);
 
 __private void uci_cleanup(struct uci_context *ctx);
 __private struct uci_element *uci_lookup_list(struct uci_list *list, const char *name);
-__private void uci_fixup_section(struct uci_context *ctx, struct uci_section *s);
 __private void uci_free_package(struct uci_package **package);
 __private struct uci_element *uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size);
 __private void uci_free_element(struct uci_element *e);
@@ -65,17 +74,17 @@ __private int uci_load_delta(struct uci_context *ctx, struct uci_package *p, boo
 
 static inline bool uci_validate_package(const char *str)
 {
-       return uci_validate_str(str, false);
+       return uci_validate_str(str, false, true);
 }
 
 static inline bool uci_validate_type(const char *str)
 {
-       return uci_validate_str(str, false);
+       return uci_validate_str(str, false, false);
 }
 
 static inline bool uci_validate_name(const char *str)
 {
-       return uci_validate_str(str, true);
+       return uci_validate_str(str, true, false);
 }
 
 /* initialize a list head/item */
@@ -210,7 +219,7 @@ struct uci_backend _var = {         \
                ctx->err = __val;       \
                memcpy(ctx->trap, __old_trap, sizeof(ctx->trap)); \
                goto handler;           \
-       }
+       } while(0)
 #define UCI_TRAP_RESTORE(ctx)          \
        memcpy(ctx->trap, __old_trap, sizeof(ctx->trap)); \
 } while(0)