From fe7647dc77d4c78e7aabcf25723f01891dd925d1 Mon Sep 17 00:00:00 2001 From: Hyojung Jo Date: Sun, 2 Aug 2015 13:26:13 +0900 Subject: [PATCH] Fixed the checkpatch error Change-Id: I5473abbf6178c4ad910a44027f0554287790b811 Signed-off-by: Hyojung Jo --- src/data/app.c | 3 ++- src/data/media.c | 3 ++- src/grid/grid_apps.c | 5 ++--- src/grid/grid_webs.c | 6 +++--- src/view/view_base.c | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/data/app.c b/src/data/app.c index dadbf2b..5248445 100644 --- a/src/data/app.c +++ b/src/data/app.c @@ -183,6 +183,7 @@ static struct datamgr _dmgr = { .action = _action, }; -struct datamgr *get_apps_datamgr(void) { +struct datamgr *get_apps_datamgr(void) +{ return &_dmgr; } diff --git a/src/data/media.c b/src/data/media.c index 6fdbd64..e6963e8 100644 --- a/src/data/media.c +++ b/src/data/media.c @@ -274,6 +274,7 @@ static struct datamgr _dmgr = { .action = _action, }; -struct datamgr *get_media_datamgr(void) { +struct datamgr *get_media_datamgr(void) +{ return &_dmgr; } diff --git a/src/grid/grid_apps.c b/src/grid/grid_apps.c index bcd0489..d19db9b 100644 --- a/src/grid/grid_apps.c +++ b/src/grid/grid_apps.c @@ -50,8 +50,7 @@ static struct color color_icon[] = { {169, 54, 54, 255} }; -static struct color color_text[] = -{ +static struct color color_text[] = { {93, 88, 82, 255}, {55, 143, 162, 255}, {75, 102, 163, 255}, @@ -157,7 +156,7 @@ static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *part) if (!text_bg) { _ERR("elm_rectangle_add failed."); evas_object_del(ly); - return NULL;; + return NULL; } /* FIXME: The color will be changed as GUI later. */ diff --git a/src/grid/grid_webs.c b/src/grid/grid_webs.c index 7bfc2f0..5ee5ed6 100644 --- a/src/grid/grid_webs.c +++ b/src/grid/grid_webs.c @@ -37,8 +37,7 @@ struct color { int a; }; -static struct color colors[] = -{ +static struct color colors[] = { {73, 68, 62, 255}, {55, 74, 97, 255}, {75, 102, 163, 255}, @@ -70,7 +69,7 @@ static char *_text_get(void *data, Evas_Object *obj, const char *part) static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *part) { struct datamgr *dmgr; - Evas_Object *img, *text_bg; + Evas_Object *img = NULL, *text_bg; char *snapshot; int idx; @@ -87,6 +86,7 @@ static Evas_Object *_content_get(void *data, Evas_Object *obj, const char *part) snapshot = dmgr->get_data(data, DATA_THUMBNAIL); if (!snapshot) { /* FIXME: The default snapshot image should be added. */ + return NULL; } img = elm_image_add(obj); diff --git a/src/view/view_base.c b/src/view/view_base.c index 03ccb3f..e7a5901 100644 --- a/src/view/view_base.c +++ b/src/view/view_base.c @@ -139,7 +139,7 @@ static void _mouse_move_cb(int id, void *data, Evas *e, Evas_Object *obj, } if (!elm_object_focus_get(obj)) - elm_object_focus_set(obj ,EINA_TRUE); + elm_object_focus_set(obj, EINA_TRUE); } static void _menu_clicked_cb(int id, void *data, Evas_Object *obj) @@ -153,7 +153,7 @@ static void _menu_focused_cb(int id, void *data, Evas_Object *obj, struct _priv *priv; int pre_menu_id; - if (!data || !obj ) { + if (!data || !obj) { _ERR("Invalid argument."); return; } -- 2.7.4