s/frame_inst/frame_state/g

diff --git a/src/lib/unlang/function.c b/src/lib/unlang/function.c
index 3ed019b59c0c5b8cbe781b6949c5da2c7dd6bec8..03d55a1bf80ea499221ee320756a695f29489830 100644 (file)
--- a/src/lib/unlang/function.c
+++ b/src/lib/unlang/function.c
@@ -130,8 +130,8 @@ void unlang_function_init(void)
                                .name = "function",
                                .func = unlang_function_call,
                                .debug_braces = false,
-                               .frame_inst_size = sizeof(unlang_frame_state_func_t),
-                               .frame_inst_name = "unlang_frame_state_func_t",
+                               .frame_state_size = sizeof(unlang_frame_state_func_t),
+                               .frame_state_name = "unlang_frame_state_func_t",
                           });
 
 }

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index bc307bcaf2efea5df037dd3958b920b1b8c99cb3..de13eb2846ef5ddb26a4267516479e08b040b0c8 100644 (file)
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -228,9 +228,9 @@ static inline void frame_setup(unlang_stack_t *stack, unlang_stack_frame_t *fram
        /*
         *      The frame needs to track state.  Do so here.
         */
-       if (op->frame_inst_size) {
-               MEM(frame->state = talloc_zero_array(stack, uint8_t, op->frame_inst_size));
-               talloc_set_name_const(frame->state, op->frame_inst_name);
+       if (op->frame_state_size) {
+               MEM(frame->state = talloc_zero_array(stack, uint8_t, op->frame_state_size));
+               talloc_set_name_const(frame->state, op->frame_state_name);
        }
 }
 

diff --git a/src/lib/unlang/interpret.h b/src/lib/unlang/interpret.h
index c008c296a5018984acc65d3b7a6379861407a1e7..1a5055506d91c07d398ed54941215d0b65a188f8 100644 (file)
--- a/src/lib/unlang/interpret.h
+++ b/src/lib/unlang/interpret.h
@@ -93,8 +93,9 @@ typedef struct {
        bool                    debug_braces;                   //!< Whether the operation needs to print braces
                                                                ///< in debug mode.
 
-       size_t                  frame_inst_size;                //!< size of instance data in the stack frame
-       char const              *frame_inst_name;               //!< talloc name of the frame instance data
+       size_t                  frame_state_size;                       //!< size of instance data in the stack frame
+
+       char const              *frame_state_name;              //!< talloc name of the frame instance data
 } unlang_op_t;
 
 void           unlang_interpret_push_function(REQUEST *request,

diff --git a/src/lib/unlang/load_balance.c b/src/lib/unlang/load_balance.c
index 6e648e08af0d61b93cdd8275ac2c01809466aa5a..cfd6021feb407ecc271767fdcd731809b71a9449 100644 (file)
--- a/src/lib/unlang/load_balance.c
+++ b/src/lib/unlang/load_balance.c
@@ -292,8 +292,8 @@ void unlang_load_balance_init(void)
                                .name = "load-balance group",
                                .func = unlang_load_balance,
                                .debug_braces = true,
-                               .frame_inst_size = sizeof(unlang_frame_state_redundant_t),
-                               .frame_inst_name = "unlang_frame_state_redundant_t",
+                               .frame_state_size = sizeof(unlang_frame_state_redundant_t),
+                               .frame_state_name = "unlang_frame_state_redundant_t",
                           });
 
        unlang_register(UNLANG_TYPE_REDUNDANT_LOAD_BALANCE,
@@ -301,7 +301,7 @@ void unlang_load_balance_init(void)
                                .name = "redundant-load-balance group",
                                .func = unlang_redundant_load_balance,
                                .debug_braces = true,
-                               .frame_inst_size = sizeof(unlang_frame_state_redundant_t),
-                               .frame_inst_name = "unlang_frame_state_redundant_t",
+                               .frame_state_size = sizeof(unlang_frame_state_redundant_t),
+                               .frame_state_name = "unlang_frame_state_redundant_t",
                           });
 }

diff --git a/src/lib/unlang/map.c b/src/lib/unlang/map.c
index c7937689e23c1822e45853e37d709eca506799a1..224a927a1c455b4f0161306128d7dfcfa99c1eec 100644 (file)
--- a/src/lib/unlang/map.c
+++ b/src/lib/unlang/map.c
@@ -370,7 +370,7 @@ void unlang_map_init(void)
                           &(unlang_op_t){
                                .name = "map",
                                .func = unlang_map_state_init,
-                               .frame_inst_size = sizeof(unlang_frame_state_map_proc_t),
-                               .frame_inst_name = "unlang_frame_state_map_proc_t",
+                               .frame_state_size = sizeof(unlang_frame_state_map_proc_t),
+                               .frame_state_name = "unlang_frame_state_map_proc_t",
                           });
 }