tests: use uci instead of uci-static

[project/uci.git] / uci_internal.h

diff --git a/uci_internal.h b/uci_internal.h
index 453aabb..89863f1 100644 (file)
--- a/uci_internal.h
+++ b/uci_internal.h
@@ -33,7 +33,13 @@ struct uci_parse_context
        const char *name;
        char *buf;
        int bufsz;
+       int 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))
 
 extern const char *uci_confdir;
 extern const char *uci_savedir;
@@ -46,11 +52,11 @@ __private void uci_add_delta(struct uci_context *ctx, struct uci_list *list, int
 __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, int pos, bool write, bool create);
+__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_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);
@@ -160,7 +166,7 @@ struct uci_backend _var = {         \
 #define DPRINTF(...)
 #endif
 
-/* 
+/*
  * throw an uci exception and store the error number
  * in the context.
  */
@@ -217,7 +223,7 @@ struct uci_backend _var = {         \
 
 /**
  * UCI_INTERNAL: Do an internal call of a public API function
- * 
+ *
  * Sets Exception handling to passthrough mode.
  * Allows API functions to change behavior compared to public use
  */
@@ -228,7 +234,7 @@ struct uci_backend _var = {         \
 
 /**
  * UCI_NESTED: Do an normal nested call of a public API function
- * 
+ *
  * Sets Exception handling to passthrough mode.
  * Allows API functions to change behavior compared to public use
  */