put more descriptive names on anonymous sections when running uci show (can be reused...

[project/uci.git] / uci_internal.h

diff --git a/uci_internal.h b/uci_internal.h
index eba0143..111982e 100644 (file)
--- a/uci_internal.h
+++ b/uci_internal.h
@@ -114,9 +114,10 @@ struct uci_backend _var = {                \
        ctx->err = 0;                   \
        if (!ctx)                       \
                return UCI_ERR_INVAL;   \
-       if (!ctx->internal)             \
+       if (!ctx->internal && !ctx->nested) \
                __val = setjmp(ctx->trap); \
        ctx->internal = false;          \
+       ctx->nested = false;            \
        if (__val) {                    \
                DPRINTF("LEAVE: %s, ret=%d\n", __func__, __val); \
                ctx->err = __val;       \
@@ -155,6 +156,18 @@ struct uci_backend _var = {                \
        func(ctx, __VA_ARGS__);         \
 } while (0)
 
+/**
+ * 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
+ */
+#define UCI_NESTED(func, ctx, ...) do { \
+       ctx->nested = true;             \
+       func(ctx, __VA_ARGS__);         \
+} while (0)
+
+
 /*
  * check the specified condition.
  * throw an invalid argument exception if it's false