Straighten up the code

Change-Id: I8804cdf9385afcc74eda7939650bb4fff8be2973
Signed-off-by: pr.jung <pr.jung@samsung.com>

diff --git a/src/block/block.c b/src/block/block.c
index d5739fd..601ef4e 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -881,7 +881,7 @@ static void create_external_apps_directory(void)
        int ret;
 
        ret = dbus_method_async(PKGDIR_BUS_NAME, PKGDIR_PATH,
-               PKGDIR_INTERFACE, "CreateExternalDirsForAllPkgs", NULL, NULL);
+                       PKGDIR_INTERFACE, "CreateExternalDirsForAllPkgs", NULL, NULL);
        if (ret)
                _E("Fail to create external directory");
 }
@@ -2582,12 +2582,12 @@ static void remove_whole_block_device(void)
 }
 
 static void booting_done(GDBusConnection  *conn,
-                                                       const gchar *sender,
-                                                       const gchar *path,
-                                                       const gchar *iface,
-                                                       const gchar *name,
-                                                       GVariant *param,
-                                                       gpointer data)
+               const gchar *sender,
+               const gchar *path,
+               const gchar *iface,
+               const gchar *name,
+               GVariant *param,
+               gpointer data)
 {
        static int done = 0;
        int ret;
@@ -2610,12 +2610,12 @@ static void booting_done(GDBusConnection  *conn,
 }
 
 static void block_poweroff(GDBusConnection  *conn,
-                                                       const gchar *sender,
-                                                       const gchar *path,
-                                                       const gchar *iface,
-                                                       const gchar *name,
-                                                       GVariant *param,
-                                                       gpointer data)
+               const gchar *sender,
+               const gchar *path,
+               const gchar *iface,
+               const gchar *name,
+               GVariant *param,
+               gpointer data)
 {
        static int status = 0;
        if (status > 0)
@@ -2705,8 +2705,8 @@ static void uevent_block_handler(struct udev_device *dev)
 }
 
 static GVariant *request_mount_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data, bool onprivate)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data, bool onprivate)
 {
        struct block_device *bdev;
        char *mount_point = NULL;
@@ -2749,7 +2749,7 @@ static GVariant *request_mount_block(GDBusConnection *conn,
        if (onprivate) {
                bdev->on_private_op = REQ_PRIVATE;
                bdev->private_pid = dbus_handle_get_sender_pid(NULL, sender);
-               _D("Private operation state: %d", bdev->on_private_op);
+               _D("Private operation state: %d pid: %d", bdev->on_private_op, bdev->private_pid);
        } else {
                if (bdev->on_private_op != REQ_NORMAL) {
                        _E("Failed to process mount operation");
@@ -2788,22 +2788,22 @@ out:
 }
 
 static GVariant *request_public_mount_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        return request_mount_block(conn, sender, path, iface, name, param, invocation, user_data, false);
 }
 
 static GVariant *request_private_mount_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        return request_mount_block(conn, sender, path, iface, name, param, invocation, user_data, true);
 }
 
 static GVariant *request_unmount_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data, bool onprivate)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data, bool onprivate)
 {
        struct block_device *bdev;
        pid_t pid;
@@ -2836,7 +2836,7 @@ static GVariant *request_unmount_block(GDBusConnection *conn,
        if (onprivate) {
                pid = dbus_handle_get_sender_pid(NULL, sender);
                if (bdev->on_private_op == REQ_NORMAL || (bdev->on_private_op != REQ_NORMAL && pid != bdev->private_pid)) {
-                       _E("Failed to process private unmount operation");
+                       _E("Failed to process private unmount operation pid: %d private_pid: %d", pid, bdev->private_pid);
                        ret = -EPERM;
                        goto out;
                }
@@ -2867,22 +2867,22 @@ out:
 }
 
 static GVariant *request_public_unmount_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        return request_unmount_block(conn, sender, path, iface, name, param, invocation, user_data, false);
 }
 
 static GVariant *request_private_unmount_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        return request_unmount_block(conn, sender, path, iface, name, param, invocation, user_data, true);
 }
 
 static GVariant *request_format_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct block_device *bdev;
        struct format_data *fdata;
@@ -2961,8 +2961,8 @@ out:
 }
 
 static GVariant *request_format_block_type(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct block_device *bdev;
        struct format_data *fdata;
@@ -3049,19 +3049,19 @@ static GVariant *block_data_to_gvariant(struct block_data *data, int flags)
                return dbus_handle_new_g_variant_tuple();
 
        return g_variant_new("(issssssisibii)",
-               data->block_type,
-               nullstr(data->devnode),
-               nullstr(data->syspath),
-               nullstr(data->fs_usage),
-               nullstr(data->fs_type),
-               nullstr(data->fs_version),
-               nullstr(data->fs_uuid_enc),
-               data->readonly,
-               nullstr(data->mount_point),
-               data->state,
-               data->primary,
-               flags >= 0 ? flags : data->flags,
-               data->id);
+                       data->block_type,
+                       nullstr(data->devnode),
+                       nullstr(data->syspath),
+                       nullstr(data->fs_usage),
+                       nullstr(data->fs_type),
+                       nullstr(data->fs_version),
+                       nullstr(data->fs_uuid_enc),
+                       data->readonly,
+                       nullstr(data->mount_point),
+                       data->state,
+                       data->primary,
+                       flags >= 0 ? flags : data->flags,
+                       data->id);
 }
 
 static GVariant *block_data_to_gvariant2(struct block_data *data, int flags)
@@ -3070,18 +3070,18 @@ static GVariant *block_data_to_gvariant2(struct block_data *data, int flags)
                return dbus_handle_new_g_variant_tuple();
 
        return g_variant_new("(issssssisibi)",
-               data->block_type,
-               nullstr(data->devnode),
-               nullstr(data->syspath),
-               nullstr(data->fs_usage),
-               nullstr(data->fs_type),
-               nullstr(data->fs_version),
-               nullstr(data->fs_uuid_enc),
-               data->readonly,
-               nullstr(data->mount_point),
-               data->state,
-               data->primary,
-               flags >= 0 ? flags : data->flags);
+                       data->block_type,
+                       nullstr(data->devnode),
+                       nullstr(data->syspath),
+                       nullstr(data->fs_usage),
+                       nullstr(data->fs_type),
+                       nullstr(data->fs_version),
+                       nullstr(data->fs_uuid_enc),
+                       data->readonly,
+                       nullstr(data->mount_point),
+                       data->state,
+                       data->primary,
+                       flags >= 0 ? flags : data->flags);
 }
 
 
@@ -3138,7 +3138,7 @@ static GVariant *block_data_to_gvariant2(struct block_data *data, int flags)
 //}
 
 static GVariant *request_get_device_info(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
        GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct block_device *bdev = NULL;
@@ -3159,16 +3159,16 @@ out:
 }
 
 static GVariant *request_show_device_list(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        show_block_device_list();
        return dbus_handle_new_g_variant_tuple();
 }
 // Called by MainThread
 static GVariant *request_get_device_list(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        GVariant *reply = NULL;
        struct block_device *bdev;
@@ -3221,19 +3221,19 @@ static GVariant *request_get_device_list(GDBusConnection *conn,
                        }
 
                        g_variant_builder_add(builder, "(issssssisibii)",
-                               data->block_type,
-                               nullstr(data->devnode),
-                               nullstr(data->syspath),
-                               nullstr(data->fs_usage),
-                               nullstr(data->fs_type),
-                               nullstr(data->fs_version),
-                               nullstr(data->fs_uuid_enc),
-                               data->readonly,
-                               nullstr(data->mount_point),
-                               data->state,
-                               data->primary,
-                               data->flags,
-                               data->id);
+                                       data->block_type,
+                                       nullstr(data->devnode),
+                                       nullstr(data->syspath),
+                                       nullstr(data->fs_usage),
+                                       nullstr(data->fs_type),
+                                       nullstr(data->fs_version),
+                                       nullstr(data->fs_uuid_enc),
+                                       data->readonly,
+                                       nullstr(data->mount_point),
+                                       data->state,
+                                       data->primary,
+                                       data->flags,
+                                       data->id);
                }
                pthread_mutex_unlock(&(th_manager[i].mutex));
        }
@@ -3249,8 +3249,8 @@ out:
 
 // Called by MainThread
 static GVariant *request_get_device_list_2(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        GVariant *reply = NULL;
        struct block_device *bdev;
@@ -3303,18 +3303,18 @@ static GVariant *request_get_device_list_2(GDBusConnection *conn,
                        }
 
                        g_variant_builder_add(builder, "(issssssisibi)",
-                               data->block_type,
-                               nullstr(data->devnode),
-                               nullstr(data->syspath),
-                               nullstr(data->fs_usage),
-                               nullstr(data->fs_type),
-                               nullstr(data->fs_version),
-                               nullstr(data->fs_uuid_enc),
-                               data->readonly,
-                               nullstr(data->mount_point),
-                               data->state,
-                               data->primary,
-                               data->flags);
+                                       data->block_type,
+                                       nullstr(data->devnode),
+                                       nullstr(data->syspath),
+                                       nullstr(data->fs_usage),
+                                       nullstr(data->fs_type),
+                                       nullstr(data->fs_version),
+                                       nullstr(data->fs_uuid_enc),
+                                       data->readonly,
+                                       nullstr(data->mount_point),
+                                       data->state,
+                                       data->primary,
+                                       data->flags);
                }
                pthread_mutex_unlock(&(th_manager[i].mutex));
        }
@@ -3327,8 +3327,8 @@ out:
 }
 
 static GVariant *request_get_mmc_primary(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct block_device *bdev;
        struct block_data *data, nodata = {0,};
@@ -3369,8 +3369,8 @@ static GVariant *request_get_mmc_primary(GDBusConnection *conn,
 }
 
 static GVariant *request_check_speed(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct timespec start_time, end_time;
        struct block_device *bdev;
@@ -3433,8 +3433,8 @@ out:
 
 
 static GVariant *request_control_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        int enable;
        int result;
@@ -3462,8 +3462,8 @@ static GVariant *request_control_block(GDBusConnection *conn,
 }
 
 static GVariant *request_getcontrol_block(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        int result;
 
@@ -3489,20 +3489,20 @@ static GVariant *request_getcontrol_block(GDBusConnection *conn,
 */
 
 static const dbus_method_s manager_methods[] = {
-       { "ShowDeviceList", NULL, NULL, request_show_device_list },
-       { "GetDeviceList" , "s", "a(issssssisibii)", request_get_device_list },
-       { "GetDeviceList2", "s", "a(issssssisibi)", request_get_device_list_2 },
-       { "Mount", "is", "i", request_public_mount_block },
-       { "Unmount", "ii", "i", request_public_unmount_block },
-       { "Format", "ii", "i", request_format_block },
-       { "FormatwithType", "iis", "i", request_format_block_type },
-       { "GetDeviceInfo", "i", "issssssisibii", request_get_device_info },
-       { "GetMmcPrimary", NULL, "issssssisibii", request_get_mmc_primary },
-       { "PrivateMount", "is", "i", request_private_mount_block },
-       { "PrivateUnmount", "ii", "i", request_private_unmount_block },
-       { "CheckSpeed", "i", "i", request_check_speed },
-       { "Control", "i", "i", request_control_block },
-       { "GetControl", "i", "i", request_getcontrol_block },
+       { "ShowDeviceList",   NULL,                 NULL, request_show_device_list },
+       { "GetDeviceList" ,    "s",   "a(issssssisibii)", request_get_device_list },
+       { "GetDeviceList2",    "s",    "a(issssssisibi)", request_get_device_list_2 },
+       { "Mount",            "is",                  "i", request_public_mount_block },
+       { "Unmount",          "ii",                  "i", request_public_unmount_block },
+       { "Format",           "ii",                  "i", request_format_block },
+       { "FormatwithType",  "iis",                  "i", request_format_block_type },
+       { "GetDeviceInfo",     "i",      "issssssisibii", request_get_device_info },
+       { "GetMmcPrimary",    NULL,      "issssssisibii", request_get_mmc_primary },
+       { "PrivateMount",     "is",                  "i", request_private_mount_block },
+       { "PrivateUnmount",   "ii",                  "i", request_private_unmount_block },
+       { "CheckSpeed",        "i",                  "i", request_check_speed },
+       { "Control",           "i",                  "i", request_control_block },
+       { "GetControl",        "i",                  "i", request_getcontrol_block },
 };
 
 static const dbus_interface_u block_interface = {

diff --git a/src/shared/udev.c b/src/shared/udev.c
index 2bdecfa..4ce94ea 100644 (file)
--- a/src/shared/udev.c
+++ b/src/shared/udev.c
@@ -265,12 +265,12 @@ int unregister_udev_uevent_control(const struct uevent_handler *uh)
 }
 
 static void device_change_poweroff(GDBusConnection  *conn,
-                                                                       const gchar *sender,
-                                                                       const gchar *path,
-                                                                       const gchar *iface,
-                                                                       const gchar *name,
-                                                                       GVariant *param,
-                                                                       gpointer data)
+               const gchar *sender,
+               const gchar *path,
+               const gchar *iface,
+               const gchar *name,
+               GVariant *param,
+               gpointer data)
 {
        static int status = 0;
        if (status > 0)

diff --git a/src/storage/storage.c b/src/storage/storage.c
index fb26935..b18f6db 100644 (file)
--- a/src/storage/storage.c
+++ b/src/storage/storage.c
@@ -278,8 +278,8 @@ static int init_storage_config_info_all(void)
 }
 
 static GVariant *dbus_getstatus(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        struct statvfs s;
        unsigned long long dAvail = 0.0;
@@ -293,8 +293,8 @@ static GVariant *dbus_getstatus(GDBusConnection *conn,
 }
 
 static GVariant *dbus_get_storage_status(GDBusConnection *conn,
-       const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
-       GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
+               const gchar *sender, const gchar *path, const gchar *iface, const gchar *name,
+               GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        char *str_path;
        struct statvfs s;
@@ -333,12 +333,12 @@ static dbus_interface_u storage_interface = {
 };
 
 static void booting_done(GDBusConnection  *conn,
-                                                       const gchar *sender,
-                                                       const gchar *path,
-                                                       const gchar *iface,
-                                                       const gchar *name,
-                                                       GVariant *param,
-                                                       gpointer data)
+               const gchar *sender,
+               const gchar *path,
+               const gchar *iface,
+               const gchar *name,
+               GVariant *param,
+               gpointer data)
 {
        static int done;
 
@@ -352,12 +352,12 @@ static void booting_done(GDBusConnection  *conn,
 }
 
 static void storage_poweroff(GDBusConnection  *conn,
-                                                               const gchar *sender,
-                                                               const gchar *path,
-                                                               const gchar *iface,
-                                                               const gchar *name,
-                                                               GVariant *param,
-                                                               gpointer data)
+               const gchar *sender,
+               const gchar *path,
+               const gchar *iface,
+               const gchar *name,
+               GVariant *param,
+               gpointer data)
 {
        if (memnoti_timer) {
                g_source_remove(memnoti_timer);
@@ -409,9 +409,9 @@ static void storage_init(void *data)
 
        /* System Session is loaded completely */
        id_booting_done = subscribe_dbus_signal(NULL, SYSTEMD_DBUS_PATH,
-                   SYSTEMD_DBUS_IFACE_MANAGER,
-                   SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED,
-                   booting_done, NULL, NULL);
+                       SYSTEMD_DBUS_IFACE_MANAGER,
+                       SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED,
+                       booting_done, NULL, NULL);
 
        id_storage_poweroff = subscribe_dbus_signal(NULL, DEVICED_PATH_POWEROFF,
                        DEVICED_INTERFACE_POWEROFF,