imc/imv cosmetics
authorAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 8 Oct 2010 04:40:03 +0000 (06:40 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 8 Oct 2010 04:40:03 +0000 (06:40 +0200)
src/libcharon/plugins/tnc_imc/tnc_imc_plugin.c
src/libcharon/plugins/tnc_imv/tnc_imv_plugin.c

index a21478e..43ba844 100644 (file)
@@ -41,10 +41,11 @@ plugin_t *tnc_imc_plugin_create()
                },
        );
 
                },
        );
 
-       tnc_config = lib->settings->get_str(lib->settings,
-                                       "charon.plugins.tnc-imc.tnc_config", "/etc/tnc_config");
        pref_lang = lib->settings->get_str(lib->settings,
                                        "charon.plugins.tnc-imc.preferred_language", "en");
        pref_lang = lib->settings->get_str(lib->settings,
                                        "charon.plugins.tnc-imc.preferred_language", "en");
+       tnc_config = lib->settings->get_str(lib->settings,
+                                       "charon.plugins.tnc-imc.tnc_config", "/etc/tnc_config");
+
        imc_count = libtnc_imc_load_config(tnc_config);
        if (imc_count < 0)
        {
        imc_count = libtnc_imc_load_config(tnc_config);
        if (imc_count < 0)
        {
@@ -54,7 +55,8 @@ plugin_t *tnc_imc_plugin_create()
        }
        else
        {
        }
        else
        {
-               DBG1(DBG_IKE, "loaded %d TNC IMC%s", imc_count, (imc_count > 1)? "s":"");
+               DBG1(DBG_IKE, "loaded %d TNC IMC%s", imc_count,
+                                                                                       (imc_count == 1) ? "":"s");
                libtnc_tncc_PreferredLanguage(pref_lang);
        }
 
                libtnc_tncc_PreferredLanguage(pref_lang);
        }
 
index 09101a4..af4d6e6 100644 (file)
@@ -52,7 +52,8 @@ plugin_t *tnc_imv_plugin_create()
        }
        else
        {
        }
        else
        {
-               DBG1(DBG_IKE, "loaded %d TNC IMV%s", imv_count, (imv_count > 1)? "s":"");
+               DBG1(DBG_IKE, "loaded %d TNC IMV%s", imv_count,
+                                                                                       (imv_count == 1) ? "":"s");
        }
 
        return &this->plugin;
        }
 
        return &this->plugin;