From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 7 Sep 2019 05:28:20 +0000 (-0500)
Subject: Consistent case
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=408350ca376e26e2ca26ec8d7826648bcea5c06b;p=thirdparty%2Ffreeradius-server.git

Consistent case
---

diff --git a/src/lib/unlang/foreach.c b/src/lib/unlang/foreach.c
index c2ca43a0d24..3e6fcad7e50 100644
--- a/src/lib/unlang/foreach.c
+++ b/src/lib/unlang/foreach.c
@@ -192,7 +192,7 @@ static unlang_action_t unlang_break(REQUEST *request, rlm_rcode_t *presult, int
 	 *	Stop at the next break point, or if we hit
 	 *	the a top frame.
 	 */
-	UNWIND_TO_BREAK(stack);
+	unwind_to_break(stack);
 	return UNLANG_ACTION_UNWIND;
 }
 
diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index f0808d52f0a..4f7c5bf9a74 100644
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -484,7 +484,7 @@ static inline unlang_frame_action_t frame_eval(REQUEST *request, unlang_stack_fr
 		do_stop:
 			frame->result = RLM_MODULE_FAIL;
 			frame->priority = 9999;
-			UNWIND_ALL(stack);
+			unwind_all(stack);
 			break;
 		}
 
diff --git a/src/lib/unlang/return.c b/src/lib/unlang/return.c
index 4f0feea6c37..c48d7b78534 100644
--- a/src/lib/unlang/return.c
+++ b/src/lib/unlang/return.c
@@ -42,7 +42,7 @@ unlang_action_t unlang_return(REQUEST *request, rlm_rcode_t *presult, int *prior
 	 *	Stop at the next return point, or if we hit
 	 *	the a top frame.
 	 */
-	UNWIND_TO_RETURN(stack);
+	unwind_to_return(stack);
 	return UNLANG_ACTION_UNWIND;
 }
 
diff --git a/src/lib/unlang/unlang_priv.h b/src/lib/unlang/unlang_priv.h
index 4c6229c2faa..9be7b79b4f0 100644
--- a/src/lib/unlang/unlang_priv.h
+++ b/src/lib/unlang/unlang_priv.h
@@ -260,9 +260,9 @@ typedef struct {
 #define is_break_point(_frame)		((_frame)->uflags & UNWIND_FLAG_BREAK_POINT)
 #define is_return_point(_frame) 	((_frame)->uflags & UNWIND_FLAG_RETURN_POINT)
 
-#define UNWIND_TO_BREAK(_stack)		((_stack)->unwind = (UNWIND_FLAG_BREAK_POINT | UNWIND_FLAG_TOP_FRAME))
-#define UNWIND_TO_RETURN(_stack)	((_stack)->unwind = (UNWIND_FLAG_RETURN_POINT | UNWIND_FLAG_TOP_FRAME))
-#define UNWIND_ALL(_stack)		((_stack)->unwind = (UNWIND_FLAG_TOP_FRAME | UNWIND_FLAG_NO_CLEAR))
+#define unwind_to_break(_stack)		((_stack)->unwind = (UNWIND_FLAG_BREAK_POINT | UNWIND_FLAG_TOP_FRAME))
+#define unwind_to_return(_stack)	((_stack)->unwind = (UNWIND_FLAG_RETURN_POINT | UNWIND_FLAG_TOP_FRAME))
+#define unwind_all(_stack)		((_stack)->unwind = (UNWIND_FLAG_TOP_FRAME | UNWIND_FLAG_NO_CLEAR))
 
 /** Our interpreter stack, as distinct from the C stack
  *