power: change variable name for clear meaning

Change-Id: Ib6342fa303d95a8597a08cb4a1f483f390dc9b75
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/src/power/power-dbus.c b/src/power/power-dbus.c
index 09a1f4a..bf0e36f 100644 (file)
--- a/src/power/power-dbus.c
+++ b/src/power/power-dbus.c
@@ -380,7 +380,7 @@ static GVariant *dbus_power_confirm_change_state_wait(GDBusConnection *conn,
 {
        int ret = 0;
        pid_t pid;
-       guint64 sleep_id;
+       guint64 wait_callback_id;
 
        pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
@@ -389,9 +389,9 @@ static GVariant *dbus_power_confirm_change_state_wait(GDBusConnection *conn,
                goto out;
        }
 
-       g_variant_get(param, "(t)", &sleep_id);
+       g_variant_get(param, "(t)", &wait_callback_id);
 
-       ret = confirm_change_state_wait(pid, sleep_id);
+       ret = confirm_change_state_wait(pid, wait_callback_id);
 
 out:
        return g_variant_new("(i)", ret);

diff --git a/src/power/power.c b/src/power/power.c
index 9db6eb8..03cff97 100644 (file)
--- a/src/power/power.c
+++ b/src/power/power.c
@@ -62,7 +62,7 @@ static GList *proc_list;
 
 struct change_state_wait {
        struct proc_info *pi;
-       guint64 id;
+       guint64 transition_id;
        int state;
 };
 
@@ -117,7 +117,8 @@ static void cleanup_waiting_list(gpointer data)
 {
        struct change_state_wait *csw = (struct change_state_wait *) data;
 
-       _E("%s(pid=%d) hasn't confirmed id=%"PRIu64"(%s)", csw->pi->comm, csw->pi->pid, csw->id, state_name(csw->state));
+       _E("%s(pid=%d) hasn't confirmed id=%"PRIu64"(%s)",
+               csw->pi->comm, csw->pi->pid, csw->transition_id, state_name(csw->state));
 
        if (kill(csw->pi->pid, 0) != 0) {
                _E("cleanup not existing process: %s(pid=%d)", csw->pi->comm, csw->pi->pid);
@@ -206,16 +207,16 @@ static gint find_csw_by_pid_id(gconstpointer data, gconstpointer udata)
        const struct change_state_wait *csw = (const struct change_state_wait *) data;
        const struct change_state_wait *target = (const struct change_state_wait *) udata;
 
-       if (csw->pi->pid == target->pi->pid && csw->id == target->id)
+       if (csw->pi->pid == target->pi->pid && csw->transition_id == target->transition_id)
                return 0;
 
        return -1;
 }
 
-int confirm_change_state_wait(pid_t pid, guint64 id)
+int confirm_change_state_wait(pid_t pid, guint64 transition_id)
 {
        struct proc_info target_pi = { .pid = pid };
-       struct change_state_wait target_csw = { .pi = &target_pi, .id = id };
+       struct change_state_wait target_csw = { .pi = &target_pi, .transition_id = transition_id };
        struct change_state_wait *csw = NULL;
        GList *l = NULL;
 
@@ -227,7 +228,7 @@ int confirm_change_state_wait(pid_t pid, guint64 id)
                return 0;
 
        csw = l->data;
-       _D("pid=%d(%s) confirmed id=%"PRIu64"(%s)", csw->pi->pid, csw->pi->comm, csw->id, state_name(csw->state));
+       _D("pid=%d(%s) confirmed id=%"PRIu64"(%s)", csw->pi->pid, csw->pi->comm, csw->transition_id, state_name(csw->state));
 
        transition_context.waitings = g_list_remove_link(transition_context.waitings, l);
        free(g_steal_pointer(&l->data));
@@ -410,7 +411,7 @@ static void init_waiting_list(gpointer data, gpointer udata)
 
        *csw = (struct change_state_wait) {
                .pi = pi,
-               .id = transition_context.id,
+               .transition_id = transition_context.id,
                .state = waiting_state,
        };
 

diff --git a/src/power/power.h b/src/power/power.h
index a2aefac..e303f66 100644 (file)
--- a/src/power/power.h
+++ b/src/power/power.h
@@ -151,6 +151,6 @@ static inline void power_request_change_state(uint64_t next, int reason)
 uint64_t power_get_state(void);
 int add_change_state_wait(pid_t pid, guint64 state);
 void remove_change_state_wait(pid_t pid, guint64 state);
-int confirm_change_state_wait(pid_t pid, guint64 id);
+int confirm_change_state_wait(pid_t pid, guint64 transition_id);
 
 #endif //__POWER_STATE_MANAGER_H__