Remove the "retry in case it works" antipattern.

Change-Id: I54e987f7d797183ed099fdf9d1fd471fa3e233b0
Signed-off-by: Michal Bloch <m.bloch@samsung.com>

diff --git a/src/proc-stat/proc-monitor.c b/src/proc-stat/proc-monitor.c
index 062b3c8..392264c 100644 (file)
--- a/src/proc-stat/proc-monitor.c
+++ b/src/proc-stat/proc-monitor.c
@@ -591,33 +591,23 @@ static gboolean check_watchdog_cb(gpointer data)
        return false;
 }
 
-#define RETRY_MAX 5
 static int proc_dbus_show_popup(const char *value)
 {
        char str_val[32];       // The original max size of represented string is 32
-       int i, ret_val = 0;
 
        snprintf(str_val, sizeof(str_val), "%s", value);
 
-       i = 0;
+       GVariantBuilder *const gv_builder = g_variant_builder_new(G_VARIANT_TYPE("a{ss}"));
+       g_variant_builder_add(gv_builder, "{ss}", WATCHDOG_KEY1, WATCHDOG_VALUE_1);
+       g_variant_builder_add(gv_builder, "{ss}", WATCHDOG_KEY2, str_val);
 
-       do {
-               GVariantBuilder *const gv_builder = g_variant_builder_new(G_VARIANT_TYPE("a{ss}"));
-               g_variant_builder_add(gv_builder, "{ss}", WATCHDOG_KEY1, WATCHDOG_VALUE_1);
-               g_variant_builder_add(gv_builder, "{ss}", WATCHDOG_KEY2, str_val);
+       GVariant *const params = g_variant_new("(a{ss})", gv_builder);
+       g_variant_builder_unref(gv_builder);
 
-               GVariant *const params = g_variant_new("(a{ss})", gv_builder);
-               g_variant_builder_unref(gv_builder);
+       int ret_val = d_bus_call_method_sync_gvariant(SYSTEM_POPUP_BUS_NAME, SYSTEM_POPUP_PATH_SYSTEM,
+               SYSTEM_POPUP_IFACE_SYSTEM, WATCHDOG_LAUNCHING_PARAM, params);
 
-               ret_val = d_bus_call_method_sync_gvariant(SYSTEM_POPUP_BUS_NAME, SYSTEM_POPUP_PATH_SYSTEM,
-                       SYSTEM_POPUP_IFACE_SYSTEM, WATCHDOG_LAUNCHING_PARAM, params);
-
-               g_variant_unref(params);
-
-               if (!ret_val)
-                       break;
-               _E("Re-try to sync DBUS message, err_count : %d", i);
-       } while (i++ < RETRY_MAX);
+       g_variant_unref(params);
 
        return ret_val;
 }