From 7119f0c483049a8850d3075c0b1062f35200a538 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Sun, 12 May 2013 12:29:21 +0200
Subject: Do not obfuscate calls with booleans

Instead of using boolean variables to denote whether the call is adding
a primary or a secondary server, use a function wrapper that tells what
it's doing by its name.
---
 src/providers/ad/ad_common.c | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/providers/ad/ad_common.c')

diff --git a/src/providers/ad/ad_common.c b/src/providers/ad/ad_common.c
index e34199959..4a6343f73 100644
--- a/src/providers/ad/ad_common.c
+++ b/src/providers/ad/ad_common.c
@@ -141,11 +141,11 @@ static void
 ad_resolve_callback(void *private_data, struct fo_server *server);
 
 static errno_t
-ad_servers_init(TALLOC_CTX *mem_ctx,
-                struct be_ctx *bectx,
-                const char *servers,
-                struct ad_options *options,
-                bool primary)
+_ad_servers_init(TALLOC_CTX *mem_ctx,
+                 struct be_ctx *bectx,
+                 const char *servers,
+                 struct ad_options *options,
+                 bool primary)
 {
     size_t i;
     errno_t ret = 0;
@@ -210,6 +210,20 @@ done:
     return ret;
 }
 
+static inline errno_t
+ad_primary_servers_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx,
+                        const char *servers, struct ad_options *options)
+{
+    return _ad_servers_init(mem_ctx, bectx, servers, options, true);
+}
+
+static inline errno_t
+ad_backup_servers_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx,
+                       const char *servers, struct ad_options *options)
+{
+    return _ad_servers_init(mem_ctx, bectx, servers, options, false);
+}
+
 static int ad_user_data_cmp(void *ud1, void *ud2)
 {
     return strcasecmp((char*) ud1, (char*) ud2);
@@ -286,13 +300,13 @@ ad_failover_init(TALLOC_CTX *mem_ctx, struct be_ctx *bectx,
         primary_servers = BE_SRV_IDENTIFIER;
     }
 
-    ret = ad_servers_init(mem_ctx, bectx, primary_servers, options, true);
+    ret = ad_primary_servers_init(mem_ctx, bectx, primary_servers, options);
     if (ret != EOK) {
         goto done;
     }
 
     if (backup_servers) {
-        ret = ad_servers_init(mem_ctx, bectx, backup_servers, options, false);
+        ret = ad_backup_servers_init(mem_ctx, bectx, backup_servers, options);
         if (ret != EOK) {
             goto done;
         }
-- 
cgit