From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Thu, 14 Feb 2019 09:58:33 +0000 (+0200)
Subject: auth-policy: Move callback to helper function
X-Git-Tag: 2.3.9~774
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1fa1864b014012ecc6d25689e3d6e6ee06bf44b;p=thirdparty%2Fdovecot%2Fcore.git

auth-policy: Move callback to helper function
---

diff --git a/src/auth/auth-policy.c b/src/auth/auth-policy.c
index d5cf75049f..be50c1f1cf 100755
--- a/src/auth/auth-policy.c
+++ b/src/auth/auth-policy.c
@@ -247,6 +247,13 @@ void auth_policy_finish(struct policy_lookup_ctx *context)
 		auth_request_unref(&context->request);
 }
 
+static
+void auth_policy_callback(struct policy_lookup_ctx *context)
+{
+	if (context->callback != NULL)
+		context->callback(context->result, context->callback_context);
+}
+
 static
 void auth_policy_parse_response(struct policy_lookup_ctx *context)
 {
@@ -332,9 +339,7 @@ void auth_policy_parse_response(struct policy_lookup_ctx *context)
 			(context->message!=NULL?context->message:""));
 	}
 
-	if (context->callback != NULL) {
-		context->callback(context->result, context->callback_context);
-	}
+	auth_policy_callback(context);
 }
 
 static
@@ -349,8 +354,7 @@ void auth_policy_process_response(const struct http_response *response,
 		auth_request_log_error(context->request, "policy",
 			"Policy server HTTP error: %s",
 			http_response_get_message(response));
-		if (context->callback != NULL)
-			context->callback(context->result, context->callback_context);
+		auth_policy_callback(context);
 		return;
 	}
 
@@ -358,8 +362,7 @@ void auth_policy_process_response(const struct http_response *response,
 		if (context->expect_result)
 			auth_request_log_error(context->request, "policy",
 				"Policy server result was empty");
-		if (context->callback != NULL)
-			context->callback(context->result, context->callback_context);
+		auth_policy_callback(context);
 		return;
 	}
 
@@ -371,8 +374,7 @@ void auth_policy_process_response(const struct http_response *response,
 	} else {
 		auth_request_log_debug(context->request, "policy",
 			"Policy response %d", context->result);
-		if (context->callback != NULL)
-			context->callback(context->result, context->callback_context);
+		auth_policy_callback(context);
 	}
 }