e_dbus_conn: Remove unused parameter

The following functions had parameter that was not being used in the code.
This parameter has been removed to improve code readability and maintainability:

- e_dbus_conn_sync_init()
- _e_dbus_conn_init_done_send()
- _e_dbus_conn_async_init()

These changes should have no impact on the functionality of the code.

Change-Id: I8dedfe2d5ed423be6294dbba02d26ccfd5f0ec83

diff --git a/src/bin/utils/e_dbus_conn.c b/src/bin/utils/e_dbus_conn.c
index 98f4aa1433e90d177543fb9e15e4a80e01082f72..ee04e8fd6745c1fc2de21276c5899a8d6476727e 100644 (file)
--- a/src/bin/utils/e_dbus_conn.c
+++ b/src/bin/utils/e_dbus_conn.c
@@ -44,11 +44,11 @@ _e_dbus_conn_init_done_event_free(void *data EINA_UNUSED, void *event)
 }
 
 static void
-_e_dbus_conn_init_done_send(E_DBus_Conn *ed)
+_e_dbus_conn_init_done_send(void)
 {
    E_DBus_Conn_Init_Done_Event *e;
 
-   if (!ed) return;
+   if (!e_dbus_conn) return;
 
    e = calloc(1, sizeof(E_DBus_Conn_Init_Done_Event));
 
@@ -58,9 +58,9 @@ _e_dbus_conn_init_done_send(E_DBus_Conn *ed)
         return;
      }
 
-   e->status = ed->init_status;
-   e->conn = eldbus_connection_ref(ed->conn);
-   e->conn_type = ed->conn_type;
+   e->status = e_dbus_conn->init_status;
+   e->conn = eldbus_connection_ref(e_dbus_conn->conn);
+   e->conn_type = e_dbus_conn->conn_type;
 
    ecore_event_add(E_EVENT_DBUS_CONN_INIT_DONE, e, _e_dbus_conn_init_done_event_free, NULL);
 }
@@ -122,7 +122,7 @@ _e_dbus_conn_init_thread_notify(void *data, Ecore_Thread *th, void *msg_data)
 static void
 _e_dbus_conn_init_thread_end(void *data, Ecore_Thread *th, void *msg_data)
 {
-   _e_dbus_conn_init_done_send(e_dbus_conn);
+   _e_dbus_conn_init_done_send();
 }
 
 static void
@@ -135,38 +135,38 @@ _e_dbus_conn_init_thread_cancel(void *data, Ecore_Thread *th, void *msg_data)
 }
 
 static Eina_Bool
-_e_dbus_conn_async_init(E_DBus_Conn *ed)
+_e_dbus_conn_async_init()
 {
-   ed->init_thread = ecore_thread_feedback_run((Ecore_Thread_Cb)_e_dbus_conn_init_thread_heavy,
+   e_dbus_conn->init_thread = ecore_thread_feedback_run((Ecore_Thread_Cb)_e_dbus_conn_init_thread_heavy,
                                              (Ecore_Thread_Notify_Cb)_e_dbus_conn_init_thread_notify,
                                              (Ecore_Thread_Cb)_e_dbus_conn_init_thread_end,
-                                             (Ecore_Thread_Cb)_e_dbus_conn_init_thread_cancel, ed, 1);
-   return !!(ed->init_thread);
+                                             (Ecore_Thread_Cb)_e_dbus_conn_init_thread_cancel, e_dbus_conn, 1);
+   return !!(e_dbus_conn->init_thread);
 }
 
 EINTERN Eina_Bool
-e_dbus_conn_sync_init(E_DBus_Conn *ed)
+e_dbus_conn_sync_init(void)
 {
    Eldbus_Connection_Type type;
 
-   if (!ed) return EINA_FALSE;
-   if (ed->conn) return EINA_TRUE;
+   if (!e_dbus_conn) return EINA_FALSE;
+   if (e_dbus_conn->conn) return EINA_TRUE;
 
-   type = ed->conn_type;
-   ed->init_status = E_DBUS_CONN_INIT_INPROGRESS;
+   type = e_dbus_conn->conn_type;
+   e_dbus_conn->init_status = E_DBUS_CONN_INIT_INPROGRESS;
 
-   if (!ed->conn)
+   if (!e_dbus_conn->conn)
      {
-        ed->conn = eldbus_connection_get(type);
+        e_dbus_conn->conn = eldbus_connection_get(type);
      }
 
-   if (!ed->conn)
+   if (!e_dbus_conn->conn)
      {
-        ed->init_status = E_DBUS_CONN_INIT_FAIL;
+        e_dbus_conn->init_status = E_DBUS_CONN_INIT_FAIL;
         return EINA_FALSE;
      }
 
-   ed->init_status = E_DBUS_CONN_INIT_SUCCESS;
+   e_dbus_conn->init_status = E_DBUS_CONN_INIT_SUCCESS;
 
    return EINA_TRUE;
 }
@@ -180,7 +180,7 @@ e_dbus_conn_dbus_init(Eldbus_Connection_Type type)
    if (!e_dbus_conn) return EINA_FALSE;
    if (e_dbus_conn->conn)
      {
-        _e_dbus_conn_init_done_send(e_dbus_conn);
+        _e_dbus_conn_init_done_send();
         return EINA_TRUE;
      }
 
@@ -194,14 +194,14 @@ e_dbus_conn_dbus_init(Eldbus_Connection_Type type)
         if (e_dbus_conn->init_thread || e_dbus_conn->init_status == E_DBUS_CONN_INIT_INPROGRESS)
           return EINA_TRUE;
 
-        res = _e_dbus_conn_async_init(e_dbus_conn);
+        res = _e_dbus_conn_async_init();
 
         return res;
      }
    else
      {
-        res = e_dbus_conn_sync_init(e_dbus_conn);
-        _e_dbus_conn_init_done_send(e_dbus_conn);
+        res = e_dbus_conn_sync_init();
+        _e_dbus_conn_init_done_send();
 
         return res;
      }
@@ -304,4 +304,3 @@ e_dbus_conn_shutdown(void)
 
    return _e_dbus_conn_init_count;
 }
-

diff --git a/src/bin/utils/e_dbus_conn_intern.h b/src/bin/utils/e_dbus_conn_intern.h
index 372521de8fa3146933037bcf7e9b0d0a930cbf8b..dcf952b48d10c5488e7e61b1f059c88b806dfe70 100644 (file)
--- a/src/bin/utils/e_dbus_conn_intern.h
+++ b/src/bin/utils/e_dbus_conn_intern.h
@@ -5,6 +5,6 @@
 #include "e_dbus_conn.h"
 
 EINTERN Eldbus_Connection *e_dbus_conn_connection_get(void);
-EINTERN Eina_Bool          e_dbus_conn_sync_init(E_DBus_Conn *ed);
+EINTERN Eina_Bool          e_dbus_conn_sync_init(void);
 
 #endif