DPM: refactoring. splitting dbus response variables

Signed-off-by: INSUN PYO <insun.pyo@samsung.com>
Change-Id: Ic4d95d570e1aed841d7c64c0f882f390283d2426

diff --git a/src/block/block.c b/src/block/block.c
index bef93ad..9f843d3 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -3474,7 +3474,8 @@ static DBusMessage *request_check_speed(dbus_method_reply_handle_h reply_handle,
        struct block_device *bdev;
        struct block_data *data;
        char *buf;
-       int ret = 0;
+       int ret;
+       int result = 0;
        int id;
        int fd;
        int time_diff;
@@ -3486,18 +3487,18 @@ static DBusMessage *request_check_speed(dbus_method_reply_handle_h reply_handle,
                        DBUS_TYPE_INT32, &id,
                        DBUS_TYPE_INVALID);
        if (!ret) {
-               ret = -1;
+               result = -1;
                goto out;
        }
 
        bdev = find_block_device_by_id(id);
        if (!bdev) {
-               ret = -1;
+               result = -1;
                goto out;
        }
        data = bdev->data;
        if (!data) {
-               ret = -1;
+               result = -1;
                goto out;
        }
 
@@ -3506,8 +3507,8 @@ static DBusMessage *request_check_speed(dbus_method_reply_handle_h reply_handle,
        buf = calloc(1, SPEEDCHECK << 20);
        if (!buf) {
                _E("calloc() failed");
+               result = -1;
                close(fd);
-               ret = -1;
                goto out;
        }
        clock_gettime(CLOCK_REALTIME, &start_time);
@@ -3520,13 +3521,14 @@ static DBusMessage *request_check_speed(dbus_method_reply_handle_h reply_handle,
 
        time_diff = end_time.tv_sec - start_time.tv_sec;
        if (time_diff > 0 && (SPEEDCHECK / time_diff < 4)) {
-               ret = -1;
+               result = -1;
                close(fd);
                goto out;
        }
 
        if (ret < 0) {
                _E("write() failed %d", errno);
+               result = -1;
                close(fd);
                goto out;
        }
@@ -3535,7 +3537,7 @@ static DBusMessage *request_check_speed(dbus_method_reply_handle_h reply_handle,
 out:
        reply = dbus_message_new_method_return(msg);
        dbus_message_iter_init_append(reply, &iter);
-       dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &ret);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &result);
        return reply;
 }
 
@@ -3545,6 +3547,7 @@ static DBusMessage *request_control_block(dbus_method_reply_handle_h reply_handl
 {
        int ret;
        int enable;
+       int result;
        DBusMessage *reply;
        DBusMessageIter iter;
 
@@ -3552,27 +3555,31 @@ static DBusMessage *request_control_block(dbus_method_reply_handle_h reply_handl
                        DBUS_TYPE_INT32, &enable,
                        DBUS_TYPE_INVALID);
        if (!ret) {
-               ret = -1;
+               result = -1;
                goto out;
        }
 
-       ret = 0;
-       if (enable == 1) {
-               _I("control block Enable");
-               block_start(NULL);
-       } else if (enable == 0) {
+       switch (enable) {
+       case 0:
                _I("control block Disable");
+               result = 0;
                block_stop(NULL);
-       } else {
+               break;
+       case 1:
+               _I("control block Enable");
+               result = 0;
+               block_start(NULL);
+               break;
+       default:
                _E("control block : Wrong request by client");
-               ret = -1;
-               goto out;
+               result = 1;
+               break;
        }
 
 out:
        reply = dbus_message_new_method_return(msg);
        dbus_message_iter_init_append(reply, &iter);
-       dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &ret);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &result);
 
        return reply;
 }
@@ -3580,17 +3587,17 @@ out:
 static DBusMessage *request_getcontrol_block(dbus_method_reply_handle_h reply_handle,
                DBusMessage *msg)
 {
-       int is_enabled;
+       int result;
        DBusMessage *reply;
        DBusMessageIter iter;
 
        _I("getcontrol block");
 
-       is_enabled = block_control;
+       result = block_control;
 
        reply = dbus_message_new_method_return(msg);
        dbus_message_iter_init_append(reply, &iter);
-       dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &is_enabled);
+       dbus_message_iter_append_basic(&iter, DBUS_TYPE_INT32, &result);
 
        return reply;
 }