app_control_h app_control = NULL;
appdata_s* ad = (appdata_s*)data;
- int ret;
+ int ret_val;
ret_if(ad == NULL);
elm_object_part_content_set(ad->internal_storage_page_data->internal_storage_page_base_layout, "elm.swallow.content", page_content);
// Unmount sdcard
- ret = dbus_handle_method_sync_var(STORAGED_BUS_NAME,
+ ret_val = dbus_handle_method_sync_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "Unmount", g_variant_new("(ii)", ad->storage_id, UNMOUNT_FORCE), NULL);
- if (ret < 0) {
- DMSG("Failed to mount sd card as portable storage: %d", ret);
+ if (ret_val < 0) {
+ DMSG("Failed to mount sd card as portable storage: %d", ret_val);
return;
}
- ret = app_control_create(&app_control);
- if (ret != APP_CONTROL_ERROR_NONE)
+ ret_val = app_control_create(&app_control);
+ if (ret_val != APP_CONTROL_ERROR_NONE)
return;
app_control_add_extra_data(app_control, VIEWTYPE_KEY, ENCRYPT_EXTENSION);
app_control_add_extra_data(app_control, DEVPATH_KEY, ad->devpath);
app_control_add_extra_data(app_control, MAPPING_NODE_KEY, "extendedsd");
- ret = app_control_set_app_id(app_control, SECURITY_APP_ID);
- if (ret != APP_CONTROL_ERROR_NONE) {
+ ret_val = app_control_set_app_id(app_control, SECURITY_APP_ID);
+ if (ret_val != APP_CONTROL_ERROR_NONE) {
app_control_destroy(app_control);
return;
}
app_control_set_launch_mode(app_control, APP_CONTROL_LAUNCH_MODE_GROUP);
- ret = app_control_send_launch_request(app_control, NULL, ad);
- if (ret != APP_CONTROL_ERROR_NONE)
- DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret);
+ ret_val = app_control_send_launch_request(app_control, NULL, ad);
+ if (ret_val != APP_CONTROL_ERROR_NONE)
+ DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret_val);
app_control_destroy(app_control);
check_speed_done(GVariant *result, void *data, GError *err)
{
appdata_s* ad = (appdata_s*)data;
- int ret;
+ int ret_val;
FUNC_BEGIN();
ret_if(ad == NULL);
ret_if(result == NULL);
- if (!g_variant_get_safe(result, "(i)", &ret)) {
+ if (!g_variant_get_safe(result, "(i)", &ret_val)) {
_E("Failed to get params from gvariant. expected:%s, type:%s", "(i)", g_variant_get_type_string(result));
g_variant_unref(result);
return;
}
- if (ret < 0) {
- DMSG("Performance warning: %d", ret);
+ if (ret_val < 0) {
+ DMSG("Performance warning: %d", ret_val);
Evas_Object* page_content = elm_object_part_content_unset(ad->internal_storage_page_data->internal_storage_page_base_layout, "elm.swallow.content");
EVAS_OBJECT_DEL(page_content);
page_content = create_page_3(ad);
FUNC_BEGIN();
appdata_s* ad = (appdata_s*)data;
- int ret;
+ int ret_dbus;
ret_if(ad == NULL);
page_content = create_page_2(ad);
elm_object_part_content_set(ad->internal_storage_page_data->internal_storage_page_base_layout, "elm.swallow.content", page_content);
- ret = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
"CheckSpeed",
check_speed_done,
DBUS_REPLY_TIMEOUT, // ms
ad);
- if (ret < 0)
- DMSG("Failed to check speed: %d", ret);
+ if (ret_dbus < 0)
+ DMSG("Failed to check speed: %d", ret_dbus);
FUNC_END();
}
FUNC_BEGIN();
app_control_h app_control = NULL;
- int ret;
+ int ret_app;
- ret = app_control_create(&app_control);
- if (ret != APP_CONTROL_ERROR_NONE)
+ ret_app = app_control_create(&app_control);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
return;
- ret = app_control_set_app_id(app_control, MYFILES_APP_ID);
- if (ret != APP_CONTROL_ERROR_NONE) {
+ ret_app = app_control_set_app_id(app_control, MYFILES_APP_ID);
+ if (ret_app != APP_CONTROL_ERROR_NONE) {
app_control_destroy(app_control);
return;
}
- ret = app_control_send_launch_request(app_control, NULL, NULL);
- if (ret != APP_CONTROL_ERROR_NONE)
- DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret);
+ ret_app = app_control_send_launch_request(app_control, NULL, NULL);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
+ DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret_app);
app_control_destroy(app_control);
FUNC_BEGIN();
app_control_h app_control = NULL;
- int ret;
+ int ret_app;
- ret = app_control_create(&app_control);
- if (ret != APP_CONTROL_ERROR_NONE)
+ ret_app = app_control_create(&app_control);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
return;
- ret = app_control_set_app_id(app_control, SETTING_APP_ID);
- if (ret != APP_CONTROL_ERROR_NONE) {
+ ret_app = app_control_set_app_id(app_control, SETTING_APP_ID);
+ if (ret_app != APP_CONTROL_ERROR_NONE) {
app_control_destroy(app_control);
return;
}
app_control_add_extra_data(app_control, VIEWTYPE_KEY, APPSELECT);
- ret = app_control_send_launch_request(app_control, NULL, NULL);
- if (ret != APP_CONTROL_ERROR_NONE)
- DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret);
+ ret_app = app_control_send_launch_request(app_control, NULL, NULL);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
+ DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret_app);
app_control_destroy(app_control);
FUNC_BEGIN();
app_control_h app_control = NULL;
- int ret;
+ int ret_app;
- ret = app_control_create(&app_control);
- if (ret != APP_CONTROL_ERROR_NONE)
+ ret_app = app_control_create(&app_control);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
return;
- ret = app_control_set_app_id(app_control, SETTING_APP_ID);
- if (ret != APP_CONTROL_ERROR_NONE) {
+ ret_app = app_control_set_app_id(app_control, SETTING_APP_ID);
+ if (ret_app != APP_CONTROL_ERROR_NONE) {
app_control_destroy(app_control);
return;
}
app_control_add_extra_data(app_control, VIEWTYPE_KEY, DEFAULT_STORAGE);
- ret = app_control_send_launch_request(app_control, NULL, NULL);
- if (ret != APP_CONTROL_ERROR_NONE)
- DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret);
+ ret_app = app_control_send_launch_request(app_control, NULL, NULL);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
+ DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret_app);
app_control_destroy(app_control);
FUNC_BEGIN();
Evas_Object *page_content = NULL;
char *str_setup;
- int ret;
+ int ret_set_cb;
- ret = storage_set_changed_cb(STORAGE_TYPE_EXTENDED_INTERNAL, mapper_device_cb, ad);
- if (ret != STORAGE_ERROR_NONE)
+ ret_set_cb = storage_set_changed_cb(STORAGE_TYPE_EXTENDED_INTERNAL, mapper_device_cb, ad);
+ if (ret_set_cb != STORAGE_ERROR_NONE)
DMSG_ERR("Failed to register signal handler for extended internal storage.");
if (ad->internal_storage_page_data) {
{
FUNC_BEGIN();
appdata_s* ad = (appdata_s*)user_data;
- GVariant *output;
+ GVariant *reply;
GVariantIter *iter;
char *new_fstype;
- int ret;
+ int ret_dbus;
int id;
ret_if(ad == NULL);
return;
if (primary) {
- ret = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
- STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "GetDeviceList", g_variant_new("(s)", "mmc"), &output);
- if (ret < 0) {
+ ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "GetDeviceList", g_variant_new("(s)", "mmc"), &reply);
+ if (ret_dbus < 0) {
DMSG("Failed to get storage information.");
return;
}
- if (!g_variant_get_safe(output, "(a(issssssisibii))", &iter)) {
- DMSG("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibii))", g_variant_get_type_string(output));
- g_variant_unref(output);
+ if (!g_variant_get_safe(reply, "(a(issssssisibii))", &iter)) {
+ DMSG("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibii))", g_variant_get_type_string(reply));
+ g_variant_unref(reply);
return;
}
g_free(new_fstype);
g_variant_iter_free(iter);
- g_variant_unref(output);
+ g_variant_unref(reply);
}
- ret = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
"FormatwithType",
format_done,
120000,
ad);
- if (ret < 0)
- DMSG("Failed to format: %d", ret);
+ if (ret_dbus < 0)
+ DMSG("Failed to format: %d", ret_dbus);
FUNC_END();
}
_format_click_cb(void *data, Evas_Object* obj, void *event_info)
{
FUNC_BEGIN();
- int ret;
+ int ret_dbus;
appdata_s* ad = (appdata_s*)data;
ret_if(ad == NULL);
elm_object_part_content_set(ad->portable_storage_page_data->portable_storage_page_base_layout, "elm.swallow.content", page_content);
- ret = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
"Unmount",
unmount_done,
DBUS_REPLY_TIMEOUT,
ad);
- if (ret < 0)
- DMSG("Failed to format: %d", ret);
+ if (ret_dbus < 0)
+ DMSG("Failed to format: %d", ret_dbus);
FUNC_END();
FUNC_BEGIN();
app_control_h app_control = NULL;
- int ret;
+ int ret_app;
- ret = app_control_create(&app_control);
- if (ret != APP_CONTROL_ERROR_NONE)
+ ret_app = app_control_create(&app_control);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
return;
- ret = app_control_set_app_id(app_control, MYFILES_APP_ID);
- if (ret != APP_CONTROL_ERROR_NONE) {
+ ret_app = app_control_set_app_id(app_control, MYFILES_APP_ID);
+ if (ret_app != APP_CONTROL_ERROR_NONE) {
app_control_destroy(app_control);
return;
}
- ret = app_control_send_launch_request(app_control, NULL, NULL);
- if (ret != APP_CONTROL_ERROR_NONE)
- DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret);
+ ret_app = app_control_send_launch_request(app_control, NULL, NULL);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
+ DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret_app);
app_control_destroy(app_control);
FUNC_BEGIN();
app_control_h app_control = NULL;
- int ret;
+ int ret_app;
- ret = app_control_create(&app_control);
- if (ret != APP_CONTROL_ERROR_NONE)
+ ret_app = app_control_create(&app_control);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
return;
- ret = app_control_set_app_id(app_control, SETTING_APP_ID);
- if (ret != APP_CONTROL_ERROR_NONE) {
+ ret_app = app_control_set_app_id(app_control, SETTING_APP_ID);
+ if (ret_app != APP_CONTROL_ERROR_NONE) {
app_control_destroy(app_control);
return;
}
app_control_add_extra_data(app_control, VIEWTYPE_KEY, DEFAULT_STORAGE);
- ret = app_control_send_launch_request(app_control, NULL, NULL);
- if (ret != APP_CONTROL_ERROR_NONE)
- DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret);
+ ret_app = app_control_send_launch_request(app_control, NULL, NULL);
+ if (ret_app != APP_CONTROL_ERROR_NONE)
+ DMSG_ERR("Failed to app_control_send_launch_request(): %d", ret_app);
app_control_destroy(app_control);
FUNC_BEGIN();
Evas_Object* page_content = NULL;
char *str_portable;
- int ret;
+ int ret_val;
- ret = storage_set_changed_cb(STORAGE_TYPE_EXTENDED_INTERNAL, mapper_device_cb, ad);
- if (ret != STORAGE_ERROR_NONE)
+ ret_val = storage_set_changed_cb(STORAGE_TYPE_EXTENDED_INTERNAL, mapper_device_cb, ad);
+ if (ret_val != STORAGE_ERROR_NONE)
DMSG_ERR("Failed to register signal handler for extended internal storage.");
if (ad->portable_storage_page_data) {
app_control(app_control_h app_control, void *data)
{
/* Handle the launch request. */
- GVariant *output;
+ GVariant *reply;
appdata_s *ad = (appdata_s *)data;
- int id;
- int ret;
+ int reply_id;
+ int ret_val;
char *type = NULL;
- char *devpath;
+ char *reply_devpath;
int len;
ret_if(ad == NULL);
- ret = storage_set_changed_cb(STORAGE_TYPE_EXTERNAL, storage_removed_cb, ad);
- if (ret != STORAGE_ERROR_NONE)
+ ret_val = storage_set_changed_cb(STORAGE_TYPE_EXTERNAL, storage_removed_cb, ad);
+ if (ret_val != STORAGE_ERROR_NONE)
DMSG_ERR("Failed to register signal handler for extended internal storage.");
len = strlen(SETUP_EXTENDED) + 1;
} else
create_home_page_base_layout(ad);
- ret = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ ret_val = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
"GetMmcPrimary",
NULL,
- &output);
- if (ret < 0) {
+ &reply);
+ if (ret_val < 0) {
DMSG("Failed to get storage information.");
return;
}
- if (!g_variant_get_safe(output, "(issssssisibii)", NULL, &devpath, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &id)) {
- DMSG("Failed to get params from gvariant. expected:%s, type:%s", "(issssssisibii)", g_variant_get_type_string(output));
- g_variant_unref(output);
+ if (!g_variant_get_safe(reply, "(issssssisibii)", NULL, &reply_devpath, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &reply_id)) {
+ DMSG("Failed to get params from gvariant. expected:%s, type:%s", "(issssssisibii)", g_variant_get_type_string(reply));
+ g_variant_unref(reply);
return;
}
- DMSG("Get Primary MMC=%d devpath=%s", id, devpath);
- ad->storage_id = id;
- ad->devpath = devpath;
+ DMSG("Get Primary MMC=%d devpath=%s", reply_id, reply_devpath);
+ ad->storage_id = reply_id;
+ ad->devpath = reply_devpath;
- g_variant_unref(output);
+ g_variant_unref(reply);
}
static void
{
/*APP_EVENT_LANGUAGE_CHANGED*/
- int ret;
+ int ret_app;
char *language;
- ret = app_event_get_language(event_info, &language);
- if (ret != APP_ERROR_NONE) {
- DMSG_ERR("Failed to app_event_get_language(): %d", ret);
+ ret_app = app_event_get_language(event_info, &language);
+ if (ret_app != APP_ERROR_NONE) {
+ DMSG_ERR("Failed to app_event_get_language(): %d", ret_app);
return;
}
static bool request_block_method(const char *method, GVariant *param, int timeout)
{
- int val, err;
+ int reply_val, ret_dbus;
bool ret = FALSE;
- GVariant *msg;
+ GVariant *reply;
- err = dbus_handle_method_sync_with_reply_var_timeout(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_with_reply_var_timeout(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
- method, param, &msg, timeout);
+ method, param, &reply, timeout);
- if (err < 0) {
+ if (ret_dbus < 0) {
_E("Failed to call dbus method(%s): no reply", method);
return ret;
}
- if (!g_variant_get_safe(msg, "(i)", &val))
+ if (!g_variant_get_safe(reply, "(i)", &reply_val))
_E("Failed to call dbus method(%s): no message", method);
else {
- if ((val == -ENOTSUP) || (val == -ENOSYS)) {
- _I("Not supported feature. %s:%d", method, val);
+ if ((reply_val == -ENOTSUP) || (reply_val == -ENOSYS)) {
+ _I("Not supported feature. %s:%d", method, reply_val);
ret = TRUE;
- } else if (val == -ENODEV) {
- _E("Failed to call %s. Device open fail: %d", method, val);
- } else if (val < 0) {
- _E("Failed to call %s. Returned fail: %d", method, val);
+ } else if (reply_val == -ENODEV) {
+ _E("Failed to call %s. Device open fail: %d", method, reply_val);
+ } else if (reply_val < 0) {
+ _E("Failed to call %s. Returned fail: %d", method, reply_val);
} else {
- _I("Success. %s:%d", method, val);
+ _I("Success. %s:%d", method, reply_val);
ret = TRUE;
}
}
- g_variant_unref(msg);
+ g_variant_unref(reply);
return ret;
}
static int get_id()
{
- GVariant *msg;
- int val, err;
+ GVariant *reply;
+ int reply_id, ret_dbus;
int ret = -1;
- err = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
METHOD_BLOCK_GETMMCPRIMARY,
NULL,
- &msg);
+ &reply);
- if (err < 0) {
+ if (ret_dbus < 0) {
_E("Failed to call dbus method(%s): no reply", METHOD_BLOCK_GETMMCPRIMARY);
return ret;
}
- if (!g_variant_get_safe(msg, "(issssssisibii)",
+ if (!g_variant_get_safe(reply, "(issssssisibii)",
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, &val))
+ NULL, NULL, NULL, NULL, NULL, NULL, &reply_id))
_E("Failed to call %s: no message", METHOD_BLOCK_GETMMCPRIMARY);
else
- ret = val;
+ ret = reply_id;
_D("Get id: %d", ret);
- g_variant_unref(msg);
+ g_variant_unref(reply);
return ret;
}
static bool block_showdevicelist()
{
- int err;
+ int ret_dbus;
_D("----------------------------------------------------------------------------------");
- err = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
METHOD_BLOCK_SHOWDEVICELIST,
NULL,
NULL);
- if (err < 0) {
+ if (ret_dbus < 0) {
_E("Failed to call dbus method(%s): no reply", METHOD_BLOCK_SHOWDEVICELIST);
return FALSE;
}
static bool block_getdevicelist(char *type)
{
- GVariant *msg;
+ GVariant *reply;
GVariantIter *iter;
- int val, err;
+ int reply_id, ret_dbus;
int ret = FALSE;
_D("----------------------------------------------------------------------------------");
- err = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
METHOD_BLOCK_GETDEVICELIST,
g_variant_new("(s)", type),
- &msg);
+ &reply);
- if (err < 0) {
+ if (ret_dbus < 0) {
_E("Failed to call dbus method(%s): no reply", METHOD_BLOCK_GETMMCPRIMARY);
return ret;
}
- if (!g_variant_get_safe(msg, "(a(issssssisibii))", &iter)) {
- _E("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibii))", g_variant_get_type_string(msg));
- g_variant_unref(msg);
+ if (!g_variant_get_safe(reply, "(a(issssssisibii))", &iter)) {
+ _E("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibii))", g_variant_get_type_string(reply));
+ g_variant_unref(reply);
return ret;
}
while (g_variant_iter_loop(iter, "(issssssisibii)",
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, &val)) {
- _D("Device id=%d", val);
+ NULL, NULL, NULL, NULL, NULL, NULL, &reply_id)) {
+ _D("Device id=%d", reply_id);
ret = TRUE;
}
g_variant_iter_free(iter);
_I("Success. (%s): %d", METHOD_BLOCK_GETDEVICELIST, ret);
- g_variant_unref(msg);
+ g_variant_unref(reply);
return ret;
}
static bool block_getdevicelist2(char *type)
{
- GVariant *msg;
+ GVariant *reply;
GVariantIter *iter;
- char *val;
- int ret = FALSE;
- int err;
+ char *reply_node;
+ bool ret = FALSE;
+ int ret_dbus;
_D("----------------------------------------------------------------------------------");
- err = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
METHOD_BLOCK_GETDEVICELIST2,
g_variant_new("(s)", type),
- &msg);
+ &reply);
- if (err < 0) {
+ if (ret_dbus < 0) {
_E("Failed to call dbus method(%s)", METHOD_BLOCK_GETMMCPRIMARY);
return ret;
}
- if (!g_variant_get_safe(msg, "(a(issssssisibi))", &iter)) {
- _E("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibi))", g_variant_get_type_string(msg));
- g_variant_unref(msg);
+ if (!g_variant_get_safe(reply, "(a(issssssisibi))", &iter)) {
+ _E("Failed to get params from gvariant. expected:%s, type:%s", "(a(issssssisibi))", g_variant_get_type_string(reply));
+ g_variant_unref(reply);
return ret;
}
while (g_variant_iter_loop(iter, "(issssssisibi)",
- NULL, &val, NULL, NULL, NULL, NULL,
+ NULL, &reply_node, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL)) {
- _D("Devnode=%s", val);
+ _D("Devnode=%s", reply_node);
ret = TRUE;
}
_I("Success. %s: %d", METHOD_BLOCK_GETDEVICELIST2, ret);
- g_variant_unref(msg);
+ g_variant_unref(reply);
return ret;
}
static bool block_getdeviceinfo(int id)
{
- GVariant *msg;
- int val = -1;
+ GVariant *reply;
+ int reply_id = -1;
int ret = FALSE;
- int err;
+ int ret_dbus;
_D("----------------------------------------------------------------------------------");
- err = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
METHOD_BLOCK_GETDEVICEINFO,
g_variant_new("(i)", id),
- &msg);
+ &reply);
- if (err < 0) {
+ if (ret_dbus < 0) {
_E("Failed to call dbus method(%s): no reply", METHOD_BLOCK_GETMMCPRIMARY);
return ret;
}
- if (!g_variant_get_safe(msg, "(issssssisibii)",
+ if (!g_variant_get_safe(reply, "(issssssisibii)",
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, &val))
+ NULL, NULL, NULL, NULL, NULL, NULL, &reply_id))
_E("Failed to call %s: no message", METHOD_BLOCK_GETMMCPRIMARY);
else
ret = TRUE;
- if (val != id) {
+ if (reply_id != id) {
ret = FALSE;
_E("Fail to call %s.", METHOD_BLOCK_GETMMCPRIMARY);
}
_I("Success. %s: %d", METHOD_BLOCK_GETDEVICEINFO, ret);
- g_variant_unref(msg);
+ g_variant_unref(reply);
return ret;
}
static bool block_getmmcprimary()
{
- GVariant *msg;
- int val = -1;
+ GVariant *reply;
+ int reply_val = -1;
int ret = FALSE;
- int err;
+ int ret_dbus;
_D("----------------------------------------------------------------------------------");
- err = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
METHOD_BLOCK_GETMMCPRIMARY,
NULL,
- &msg);
+ &reply);
- if (err < 0) {
+ if (ret_dbus < 0) {
_E("Failed to call dbus method(%s): no reply", METHOD_BLOCK_GETMMCPRIMARY);
return ret;
}
- if (!g_variant_get_safe(msg, "(issssssisibii)",
+ if (!g_variant_get_safe(reply, "(issssssisibii)",
NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, &val))
+ NULL, NULL, NULL, NULL, NULL, NULL, &reply_val))
_E("Failed to call %s: no message", METHOD_BLOCK_GETMMCPRIMARY);
else
ret = TRUE;
- _D("Id=%d", val);
+ _D("Id=%d", reply_val);
_I("Success. %s: %d", METHOD_BLOCK_GETMMCPRIMARY, ret);
- g_variant_unref(msg);
+ g_variant_unref(reply);
return ret;
}
static bool request_storage_method(const char *method, GVariant *param)
{
- GVariant *msg;
+ GVariant *reply;
unsigned long long val1, val2;
bool ret = FALSE;
- int err;
+ int ret_dbus;
- err = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME,
STORAGED_PATH_STORAGE,
STORAGED_INTERFACE_STORAGE,
- method, param, &msg);
+ method, param, &reply);
- if (err < 0) {
+ if (ret_dbus < 0) {
_E("Failed to call dbus method(%s): no reply", method);
return ret;
}
- if (!g_variant_get_safe(msg, "(tt)", &val1, &val2))
+ if (!g_variant_get_safe(reply, "(tt)", &val1, &val2))
_E("Failed to call method(%s): no message", method);
else {
if (val1 <= 0) {
}
}
- g_variant_unref(msg);
+ g_variant_unref(reply);
return ret;
}
static void remove_file(int id, bool extendedsd)
{
char file_name[PATH_LEN];
- int ret;
+ int ret_val;
if (id < 0)
return;
else
snprintf(file_name, sizeof(file_name), EXTERNAL_STORAGE_PATH"/%d", id);
- ret = remove(file_name);
- if (ret < 0)
+ ret_val = remove(file_name);
+ if (ret_val < 0)
_E("Failed to remove '%s': %d", file_name, errno);
}
static void broadcast_device_blocked(struct block_device *bdev)
{
struct block_data *data;
- int ret;
+ int ret_dbus;
if (!bdev || !bdev->data)
return;
data = bdev->data;
- ret = dbus_handle_emit_dbus_signal(NULL,
+ ret_dbus = dbus_handle_emit_dbus_signal(NULL,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
BLOCK_DEVICE_BLOCKED,
block_data_to_gvariant(data, 0));
- if (ret < 0)
+ if (ret_dbus < 0)
_E("Failed to send dbus signal");
}
GVariant *param = NULL;
const char *signal_name = NULL;
int flags = 0;
- int ret;
+ int ret_dbus;
if (!bdev || !bdev->data) {
_E("Failed to broadcast device changed signal. op(%d)", op);
/* Broadcast outside with BlockManager iface */
param = block_data_to_gvariant(data, flags);
- ret = dbus_handle_emit_dbus_signal(NULL,
+ ret_dbus = dbus_handle_emit_dbus_signal(NULL,
STORAGED_PATH_BLOCK_MANAGER,
STORAGED_INTERFACE_BLOCK_MANAGER,
signal_name,
param);
- if (ret < 0)
+ if (ret_dbus < 0)
_E("Failed to broadcast device changed signal. op(%d)", op);
}
{
const char *str;
char *name, node[64];
- int ret;
+ int ret_val;
if (!data || !data->devnode || !data->fs_usage || (strcmp(data->fs_usage, FILESYSTEM_NAME) && strncmp(data->fs_usage, "crypto", strlen("crypto"))))
return NULL;
switch (data->block_type) {
case BLOCK_MMC_DEV:
- ret = get_mmc_mount_node(name, node, sizeof(node));
+ ret_val = get_mmc_mount_node(name, node, sizeof(node));
break;
case BLOCK_SCSI_DEV:
- ret = get_scsi_mount_node(name, node, sizeof(node));
+ ret_val = get_scsi_mount_node(name, node, sizeof(node));
break;
case BLOCK_EXTENDEDSD_DEV:
return strdup(EXTENDEDSD_MOUNT_PATH);
_E("Invalid block type(%d).", data->block_type);
return NULL;
}
- if (ret < 0)
+ if (ret_val < 0)
goto out;
str = tzplatform_mkpath(TZ_SYS_MEDIA, node);
char str2[PATH_MAX];
size_t fs_len;
int len;
- int ret;
+ int ret_val;
int i;
bool found = false;
str[len - 1] = '\0';
for (i = 1; i <= 9; ++i) {
- if ((ret = snprintf(str2, sizeof(str2), "%s%d", str, i)) > sizeof(str2) - 1) {
- _E("Filename is longer than buffer. Need %d size of buffer.", ret + 1);
+ if ((ret_val = snprintf(str2, sizeof(str2), "%s%d", str, i)) > sizeof(str2) - 1) {
+ _E("Filename is longer than buffer. Need %d size of buffer.", ret_val + 1);
continue;
}
if (blkid_do_probe(probe) != 0)
continue;
- ret = blkid_probe_lookup_value(probe, "TYPE", &filesystem, &fs_len);
- if (ret < 0) {
+ ret_val = blkid_probe_lookup_value(probe, "TYPE", &filesystem, &fs_len);
+ if (ret_val < 0) {
blkid_free_probe(probe);
continue;
}
void mmc_make_default_path(const char *mount_path)
{
int i = 0;
- int ret = 0;
+ int ret_val = 0;
char mmc_path[FILE_NAME_LEN_MAX + 1] = {0, };
for (i = 0; i < DIR_NUM; ++i) {
- if ((ret = snprintf(mmc_path, sizeof(mmc_path), "%s/%s", mount_path, mmc_default_path[i])) > sizeof(mmc_path) - 1) {
- _E("Path is longer than buffer. Need %d size of buffer.", ret + 1);
+ if ((ret_val = snprintf(mmc_path, sizeof(mmc_path), "%s/%s", mount_path, mmc_default_path[i])) > sizeof(mmc_path) - 1) {
+ _E("Path is longer than buffer. Need %d size of buffer.", ret_val + 1);
continue;
}
if (!g_file_test(mmc_path, G_FILE_TEST_IS_DIR)) {
_D("Path(%s) did not exist.", mmc_path);
- ret = mkdir(mmc_path, 0777);
- if (ret != 0)
+ ret_val = mkdir(mmc_path, 0777);
+ if (ret_val != 0)
_E("Failed to mkdir: %d", errno);
/*this fuction for emulator*/
/*at the first time, the directroies are made permission 755*/
- ret = chmod(mmc_path, 0777);
- if (ret != 0)
+ ret_val = chmod(mmc_path, 0777);
+ if (ret_val != 0)
_E("Failed to chmod: %d", errno);
- ret = chown(mmc_path, 0, 10001);
- if (ret != 0)
+ ret_val = chown(mmc_path, 0, 10001);
+ if (ret_val != 0)
_E("Failed to chown: %d", errno);
}
}
static void create_external_apps_directory(void)
{
- int ret;
+ int ret_dbus;
- ret = dbus_handle_method_async_var(PKGDIR_BUS_NAME, PKGDIR_PATH,
+ ret_dbus = dbus_handle_method_async_var(PKGDIR_BUS_NAME, PKGDIR_PATH,
PKGDIR_INTERFACE, "CreateExternalDirsForAllPkgs", NULL);
- if (ret)
+ if (ret_dbus)
_E("Failed to create external directory.");
}
struct pipe_data pdata = {0,};
int n;
int thread_id;
- int ret;
+ int ret_val;
n = read(fd, &pdata, sizeof(pdata));
if (n != sizeof(pdata) || !pdata.bdev) {
if (pdata.op == BLOCK_DEV_MOUNT && pdata.result < 0) {
if (pdata.bdev->data->state == BLOCK_UNMOUNT) {
- ret = change_mount_point(pdata.bdev, "");
+ ret_val = change_mount_point(pdata.bdev, "");
/* Modify /run/external-storage/id file */
- if (ret == 0) {
+ if (ret_val == 0) {
if (pdata.bdev->data->block_type == BLOCK_EXTENDEDSD_DEV)
create_file(pdata.bdev->data->id, pdata.bdev->data->mount_point, true);
else
create_external_apps_directory();
mmc_make_default_path(pdata.bdev->data->mount_point);
- ret = dbus_handle_method_sync_var(POPUP_BUS_NAME,
+ ret_val = dbus_handle_method_sync_var(POPUP_BUS_NAME,
POPUP_PATH_NOTI,
POPUP_INTERFACE_NOTI,
MMC_POPUP_NOTI,
g_variant_new("(s)", MMC_INSERTED),
NULL);
- if (ret != 0)
- _E("Failed to popup: %d", ret);
+ if (ret_val != 0)
+ _E("Failed to popup: %d", ret_val);
}
if (pdata.op == BLOCK_DEV_UNMOUNT) {
pdata.bdev->data->primary &&
BLOCK_IS_FLAG_SET(pdata.bdev->data, UNMOUNT_UNSAFE)) {
- ret = dbus_handle_method_sync_var(POPUP_BUS_NAME,
+ ret_val = dbus_handle_method_sync_var(POPUP_BUS_NAME,
POPUP_PATH_NOTI,
POPUP_INTERFACE_NOTI,
MMC_POPUP_NOTI,
g_variant_new("(s)", MMC_REMOVED),
NULL);
- if (ret != 0)
- _E("Failed to popup: %d", ret);
+ if (ret_val != 0)
+ _E("Failed to popup: %d", ret_val);
}
}
static int pipe_init(void)
{
- int ret;
+ int ret_val;
- ret = pipe2(pfds, O_CLOEXEC);
- if (ret == -1)
+ ret_val = pipe2(pfds, O_CLOEXEC);
+ if (ret_val == -1)
return -errno;
- ret = add_fd_read_handler(pfds[0], pipe_cb,
+ ret_val = add_fd_read_handler(pfds[0], pipe_cb,
NULL, NULL, &phandler);
- if (ret < 0) {
- _E("Failed to add pipe handler: %d", ret);
- return ret;
+ if (ret_val < 0) {
+ _E("Failed to add pipe handler: %d", ret_val);
+ return ret_val;
}
return 0;
static int mount_start(struct block_device *bdev)
{
struct block_data *data;
- int ret;
+ int ret_val;
int r;
assert(bdev);
if (data->block_type == BLOCK_MMC_DEV) {
/* app2ext_migrate_legacy_all has dbus method call to deviced */
- ret = app2ext_migrate_legacy_all();
- if (ret < 0)
+ ret_val = app2ext_migrate_legacy_all();
+ if (ret_val < 0)
_E("Failed to app2ext.");
}
// Called by BlockThread
static void trigger_operation(struct block_device *bdev, GList *queue, struct operation_queue *op)
{
- int ret = 0;
+ int ret_val = 0;
int thread_id;
char devnode[PATH_MAX];
enum block_dev_operation operation;
case BLOCK_DEV_INSERT:
break;
case BLOCK_DEV_MOUNT:
- ret = block_mount_device(bdev, op->data);
- _D("Mount '%s': %d", devnode, ret);
+ ret_val = block_mount_device(bdev, op->data);
+ _D("Mount '%s': %d", devnode, ret_val);
break;
case BLOCK_DEV_FORMAT:
- ret = block_format_device(bdev, op->data);
- _D("Format '%s': %d", devnode, ret);
+ ret_val = block_format_device(bdev, op->data);
+ _D("Format '%s': %d", devnode, ret_val);
break;
case BLOCK_DEV_UNMOUNT:
- ret = block_unmount_device(bdev, op->data);
- _D("Unmount '%s': %d", devnode, ret);
+ ret_val = block_unmount_device(bdev, op->data);
+ _D("Unmount '%s': %d", devnode, ret_val);
break;
case BLOCK_DEV_REMOVE:
/* Do nothing */
break;
case BLOCK_LUKS_CLOSE:
#ifdef EXTENDED_STORAGE
- ret = ode_luks_close_sync(EXTENDEDSD_NAME);
- if (ret < 0)
+ ret_val = ode_luks_close_sync(EXTENDEDSD_NAME);
+ if (ret_val < 0)
_E("Failed on ode_luks_close(%s).", EXTENDEDSD_NAME);
#endif
break;
default:
_E("Operation type(%d) is invalid.", op->op);
- ret = -EINVAL;
+ ret_val = -EINVAL;
break;
}
op->done = true;
th_manager[thread_id].op_len--;
- block_send_dbus_reply(op->invocation, ret);
+ block_send_dbus_reply(op->invocation, ret_val);
queue = bdev->op_queue;
if (queue != NULL) {
GDBusMethodInvocation *invocation, void *data)
{
struct operation_queue *op;
- int ret;
+ int ret_val;
int thread_id;
bool start_th;
if (!start_th) {
_D("Start new thread for block device.");
th_manager[thread_id].start_th = true;
- ret = pthread_create(&(th_manager[thread_id].th), NULL, block_th_start, &th_manager[thread_id]);
- if (ret != 0) {
+ ret_val = pthread_create(&(th_manager[thread_id].th), NULL, block_th_start, &th_manager[thread_id]);
+ if (ret_val != 0) {
_E("Failed to create thread for %s.", bdev->data->devnode);
return -EPERM;
}
static void booting_done(void)
{
static int done = 0;
- int ret;
+ int ret_val;
if (done > 0)
return;
_I("Booting done.");
/* register mmc uevent control routine */
- ret = register_udev_uevent_control(&uh);
- if (ret < 0)
- _E("Failed to register block uevent: %d", ret);
+ ret_val = register_udev_uevent_control(&uh);
+ if (ret_val < 0)
+ _E("Failed to register block uevent: %d", ret_val);
block_control = true;
/* if there is the attached device, try to mount */
block_init_from_udev_enumerate();
- ret = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
+ ret_val = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
DEVICED_PATH_POWEROFF,
DEVICED_INTERFACE_POWEROFF,
METHOD_ADD_POWEROFF_WAIT,
NULL,
add_poweroff_wait_cb,
-1, NULL);
- if (ret < 0)
+ if (ret_val < 0)
_E("Failed to call "METHOD_ADD_POWEROFF_WAIT" method.");
block_boot = true;
gpointer data)
{
static int status = 0;
- int ret;
+ int ret_dbus;
if (status > 0)
return;
terminate_threads();
if (add_poweroff_wait) {
- ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+ ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
DEVICED_PATH_POWEROFF,
DEVICED_INTERFACE_POWEROFF,
METHOD_REMOVE_POWEROFF_WAIT,
NULL, NULL);
- if (ret < 0)
+ if (ret_dbus < 0)
_E("Failed to call "METHOD_REMOVE_POWEROFF_WAIT" method.");
else
add_poweroff_wait = false;
struct block_device *bdev;
struct block_data *data;
char *buf = NULL;
- int ret;
+ int ret_val;
int result = 0;
int id;
int fd;
result = -1;
goto out;
}
- ret = posix_memalign((void**)&buf, 4096, SPEEDCHECK_SIZE << 20);
- if (ret) {
+ ret_val = posix_memalign((void**)&buf, 4096, SPEEDCHECK_SIZE << 20);
+ if (ret_val) {
_E("Failed to posix_memalign().");
result = -1;
goto out_close;
clock_gettime(CLOCK_REALTIME, &start_time);
_I("Start time=%lu.%lu", start_time.tv_sec, start_time.tv_nsec);
- ret = read(fd, buf, SPEEDCHECK_SIZE << 20);
+ ret_val = read(fd, buf, SPEEDCHECK_SIZE << 20);
clock_gettime(CLOCK_REALTIME, &end_time);
_I("End time=%lu.%lu", end_time.tv_sec, end_time.tv_nsec);
free(buf);
- if (ret < 0) {
+ if (ret_val < 0) {
_E("Failed to read(): %d", errno);
result = -1;
goto out_close;
#ifdef BLOCK_TMPFS
static int mount_root_path_tmpfs(void)
{
- int ret;
+ int ret_val;
const char *root;
root = tzplatform_getenv(TZ_SYS_MEDIA);
if (mount_check(root))
return 0;
- ret = mount("tmpfs", root, "tmpfs", 0, "smackfsroot=System::Shared");
- if (ret < 0) {
- ret = -errno;
- _E("Failed to mount tmpfs: %d", ret);
- return ret;
+ ret_val = mount("tmpfs", root, "tmpfs", 0, "smackfsroot=System::Shared");
+ if (ret_val < 0) {
+ ret_val = -errno;
+ _E("Failed to mount tmpfs: %d", ret_val);
+ return ret_val;
}
return 0;
static void block_init(void *data)
{
- int ret;
+ int ret_val;
int i;
udev_init(NULL);
/* load config */
- ret = config_parse(BLOCK_CONF_FILE, load_config, NULL);
- if (ret < 0)
+ ret_val = config_parse(BLOCK_CONF_FILE, load_config, NULL);
+ if (ret_val < 0)
_E("Failed to load '%s'. Use default value.", BLOCK_CONF_FILE);
- ret = mount_root_path_tmpfs();
- if (ret < 0)
- _E("Failed to mount tmpfs to root mount path: %d", ret);
+ ret_val = mount_root_path_tmpfs();
+ if (ret_val < 0)
+ _E("Failed to mount tmpfs to root mount path: %d", ret_val);
/* register block manager object and interface */
- ret = dbus_handle_register_dbus_object(NULL, STORAGED_PATH_BLOCK_MANAGER, &block_interface);
- if (ret < 0)
- _E("Failed to register block interface and methods: %d", ret);
+ ret_val = dbus_handle_register_dbus_object(NULL, STORAGED_PATH_BLOCK_MANAGER, &block_interface);
+ if (ret_val < 0)
+ _E("Failed to register block interface and methods: %d", ret_val);
/* init pipe */
- ret = pipe_init();
- if (ret < 0)
+ ret_val = pipe_init();
+ if (ret_val < 0)
_E("Failed to init pipe.");
for (i = 0; i < THREAD_MAX; i++) {
pthread_cond_init(&(th_manager[i].cond), NULL);
}
- ret = remove_directory(EXTERNAL_STORAGE_PATH);
- if (ret < 0)
+ ret_val = remove_directory(EXTERNAL_STORAGE_PATH);
+ if (ret_val < 0)
_E("Failed to remove directory.");
- ret = mkdir(EXTERNAL_STORAGE_PATH, 0755);
- if (ret < 0)
+ ret_val = mkdir(EXTERNAL_STORAGE_PATH, 0755);
+ if (ret_val < 0)
_E("Failed to make directory: %d", errno);
- ret = remove_directory(EXTENDED_INTERNAL_PATH);
- if (ret < 0)
+ ret_val = remove_directory(EXTENDED_INTERNAL_PATH);
+ if (ret_val < 0)
_E("Failed to remove directory.");
- ret = mkdir(EXTENDED_INTERNAL_PATH, 0755);
- if (ret < 0)
+ ret_val = mkdir(EXTENDED_INTERNAL_PATH, 0755);
+ if (ret_val < 0)
_E("Failed to make directory: %d", errno);
- ret = get_internal_storage_number();
- if (ret < 0)
+ ret_val = get_internal_storage_number();
+ if (ret_val < 0)
_E("Failed to get internal storage number.");
id_block_poweroff = subscribe_dbus_signal(NULL, DEVICED_PATH_POWEROFF,
static void block_exit(void *data)
{
- int ret;
+ int ret_val;
udev_exit(NULL);
unsubscribe_dbus_signal(NULL, id_block_poweroff);
/* unregister mmc uevent control routine */
- ret = unregister_udev_uevent_control(&uh);
- if (ret < 0)
- _E("Failed to unregister block uevent: %d", ret);
+ ret_val = unregister_udev_uevent_control(&uh);
+ if (ret_val < 0)
+ _E("Failed to unregister block uevent: %d", ret_val);
/* remove remaining blocks */
remove_whole_block_device();
pipe_exit();
if (add_poweroff_wait) {
- ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+ ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
DEVICED_PATH_POWEROFF,
DEVICED_INTERFACE_POWEROFF,
METHOD_REMOVE_POWEROFF_WAIT,
NULL, NULL);
- if (ret < 0)
+ if (ret_val < 0)
_E("Failed to call "METHOD_REMOVE_POWEROFF_WAIT" method.");
else
add_poweroff_wait = false;
enum tzplatform_variable path;
char *value;
char buf[20];
- int ret;
+ int ret_dbus;
if (info->mem_id == MEMORY_INTERNAL)
path = TZ_SYS_USER;
_D("time=%s path=%d level=%s", buf, path, value);
out:
- ret = dbus_handle_emit_dbus_signal(NULL,
+ ret_dbus = dbus_handle_emit_dbus_signal(NULL,
STORAGED_PATH_LOWMEM,
STORAGED_INTERFACE_LOWMEM,
SIGNAL_NEED_CLEANUP,
g_variant_new("(is)", path, value));
- if (ret < 0)
+ if (ret_dbus < 0)
_E("Failed to send dbus signal");
cleanup_storage(path, level);
static void _popup_cb(GVariant *var, void *user_data, GError *err)
{
- int ret;
+ int ret_val;
if (!var) {
_E("No message: %s", err->message);
return;
}
- if (!g_variant_get_safe(var, "(i)", &ret)) {
+ if (!g_variant_get_safe(var, "(i)", &ret_val)) {
_E("No message: %s", g_variant_get_type_string(var));
goto out;
}
- _D("Reply value: %d", ret);
+ _D("Reply value: %d", ret_val);
out:
g_variant_unref(var);
static void _noti_cb(GVariant *var, void *user_data, GError *err)
{
- int ret;
+ int ret_val;
if (!var) {
_E("No message: %s", err->message);
return;
}
- if (!g_variant_get_safe(var, "(i)", &ret)) {
+ if (!g_variant_get_safe(var, "(i)", &ret_val)) {
_E("No message: %s", g_variant_get_type_string(var));
goto out;
}
- noti_id = ret;
- _D("Reply value: %d", ret);
+ noti_id = ret_val;
+ _D("Reply value: %d", ret_val);
out:
g_variant_unref(var);
static int storage_get_memory_size(const char *path, struct statvfs *s)
{
- int ret;
+ int ret_val;
if (!path) {
_E("Input param error.");
return -EINVAL;
}
- ret = statvfs(path, s);
- if (ret) {
+ ret_val = statvfs(path, s);
+ if (ret_val) {
_E("Failed to get storage size.");
return -errno;
}
static void check_internal_storage(struct storage_config_info *info)
{
static enum memnoti_level old = MEMNOTI_LEVEL_NORMAL;
- int ret;
+ int ret_val;
if (info->current_noti_level < MEMNOTI_LEVEL_NORMAL && info->current_noti_level < old) {
- ret = process_memory_info(info->current_noti_level);
- if (ret != 0)
+ ret_val = process_memory_info(info->current_noti_level);
+ if (ret_val != 0)
info->current_noti_level = MEMNOTI_LEVEL_NORMAL;
}
if (info->current_noti_level == MEMNOTI_LEVEL_NORMAL && info->current_noti_level > old) {
- ret = process_memory_info(info->current_noti_level);
- if (ret != 0)
+ ret_val = process_memory_info(info->current_noti_level);
+ if (ret_val != 0)
info->current_noti_level = MEMNOTI_LEVEL_NORMAL;
}
old = info->current_noti_level;
pid_t pid;
unsigned long long dAvail = 0.0;
unsigned long long dTotal = 0.0;
- int ret;
+ int ret_val;
bool success = true;
g_variant_get(param, "(s)", &str_path);
temp = tzplatform_getenv(TZ_SYS_USER);
if (!strncmp(str_path, temp, strlen(temp))) {
- ret = stat(str_path, &buf);
- if (ret == 0) {
- ret = storage_get_internal_memory_size(&s);
- if (ret < 0)
+ ret_val = stat(str_path, &buf);
+ if (ret_val == 0) {
+ ret_val = storage_get_internal_memory_size(&s);
+ if (ret_val < 0)
success = false;
} else
success = false;
} else {
- ret = storage_get_memory_size(str_path, &s);
- if (ret < 0)
+ ret_val = storage_get_memory_size(str_path, &s);
+ if (ret_val < 0)
success = false;
}
static void storage_config_load(struct storage_config_info *info)
{
- int ret;
+ int ret_val;
- ret = config_parse(STORAGE_CONF_FILE, load_config, info);
- if (ret < 0)
- _E("Failed to load %s, %d Use default value.", STORAGE_CONF_FILE, ret);
+ ret_val = config_parse(STORAGE_CONF_FILE, load_config, info);
+ if (ret_val < 0)
+ _E("Failed to load %s, %d Use default value.", STORAGE_CONF_FILE, ret_val);
}
static void storage_init(void *data)
{
- int ret;
+ int ret_val;
storage_config_load(&storage_internal_info);
- ret = dbus_handle_register_dbus_object(NULL, STORAGED_PATH_STORAGE,
+ ret_val = dbus_handle_register_dbus_object(NULL, STORAGED_PATH_STORAGE,
&storage_interface);
- if (ret < 0)
- _E("Failed to register dbus interface and methods: %d", ret);
+ if (ret_val < 0)
+ _E("Failed to register dbus interface and methods: %d", ret_val);
- ret = remove_directory(NEED_CLEANUP_DIR_PATH);
- if (ret < 0)
+ ret_val = remove_directory(NEED_CLEANUP_DIR_PATH);
+ if (ret_val < 0)
_E("Failed to remove directory.");
- ret = mkdir(NEED_CLEANUP_DIR_PATH, 0644);
- if (ret < 0)
+ ret_val = mkdir(NEED_CLEANUP_DIR_PATH, 0644);
+ if (ret_val < 0)
_E("Failed to make directory: %d", errno);
init_cleanup_storage();
projects / platform / core / system / storaged.git / commitdiff