refactoring: simplify getting conf file names

Change-Id: Ib452c4c11480ab388c69296d6e220ac725e83ee0

diff --git a/src/libdbuspolicy1.cpp b/src/libdbuspolicy1.cpp
index 96ae45f..5b8b6bb 100644 (file)
--- a/src/libdbuspolicy1.cpp
+++ b/src/libdbuspolicy1.cpp
@@ -152,16 +152,30 @@ static std::shared_ptr<const char> bus_path_resolve(const char *bus_path, BusTyp
        return resolved_path;
 }
 
+static const char *primary_conf_file(BusType bus_type)
+{
+       if (SYSTEM_BUS == bus_type)
+               return system_bus_conf_file_primary();
+       return session_bus_conf_file_primary();
+}
+
+static const char *secondary_conf_file(BusType bus_type)
+{
+       if (SYSTEM_BUS == bus_type)
+               return SYSTEM_BUS_CONF_FILE_SECONDARY;
+       return SESSION_BUS_CONF_FILE_SECONDARY;
+}
+
 static void init_common_locked(BusType bus_type)
 {
-       int ret = __internal_init_auto_serialized(bus_type, (bus_type == SYSTEM_BUS) ? system_bus_conf_file_primary() : session_bus_conf_file_primary());
+       int ret = __internal_init_auto_serialized(bus_type, primary_conf_file(bus_type));
        if (ret < 0)
-               ret = __internal_init(bus_type, (bus_type == SYSTEM_BUS) ? SYSTEM_BUS_CONF_FILE_SECONDARY : SESSION_BUS_CONF_FILE_SECONDARY);
+               ret = __internal_init(bus_type, secondary_conf_file(bus_type));
+
+       assert(ret >= 0 && "failed __internal_init");
 
        if (ret >= 0)
                __internal_init_sup_group(bus_type, g_udesc.uid, g_udesc.gid);
-       else
-               assert(false && "failed __internal_init");
 }
 
 static void init_global_conn_locked(BusType bus_type, std::shared_ptr<const char> resolved_path)