From 22324f21b30d25d1b2076d5dc7501de46c348deb Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 13 Jan 2016 15:19:07 +0900 Subject: [PATCH] EFL: Mark EOLIAN functions as static when possible This affects mostly evas filters. --- src/lib/ecore_con/ecore_con.c | 2 +- src/lib/emotion/emotion_smart.c | 2 +- src/lib/eo/eo_base_class.c | 2 +- src/lib/evas/canvas/evas_filter_mixin.c | 24 ++++++++++++------------ src/lib/evas/canvas/evas_object_image.c | 8 ++++---- src/lib/evas/canvas/evas_object_text.c | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index 9e3361121f..0235d9f4d1 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -629,7 +629,7 @@ _ecore_con_server_ecore_con_base_connected_get(Eo *obj EINA_UNUSED, Ecore_Con_Se return !svr->connecting; } -EOLIAN const Eina_List * +EOLIAN static const Eina_List * _ecore_con_server_clients_get(Eo *obj EINA_UNUSED, Ecore_Con_Server_Data *svr) { return svr->clients; diff --git a/src/lib/emotion/emotion_smart.c b/src/lib/emotion/emotion_smart.c index 969780a172..26b440d840 100644 --- a/src/lib/emotion/emotion_smart.c +++ b/src/lib/emotion/emotion_smart.c @@ -417,7 +417,7 @@ emotion_object_file_get(const Evas_Object *obj) return file; } -EOLIAN void +EOLIAN static void _emotion_object_efl_file_file_get(Eo *obj EINA_UNUSED, Emotion_Object_Data *sd, const char **file, const char **key) { if (file) *file = sd->file; diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index 6467a2fb94..246bcc2d60 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c @@ -319,7 +319,7 @@ _eo_base_wref_add(Eo *obj, Eo_Base_Data *pd, Eo **wref) *wref = obj; } -EOLIAN void +EOLIAN static void _eo_base_wref_del(Eo *obj, Eo_Base_Data *pd, Eo **wref) { size_t count; diff --git a/src/lib/evas/canvas/evas_filter_mixin.c b/src/lib/evas/canvas/evas_filter_mixin.c index ebafda542c..edc47f9ecd 100644 --- a/src/lib/evas/canvas/evas_filter_mixin.c +++ b/src/lib/evas/canvas/evas_filter_mixin.c @@ -353,7 +353,7 @@ evas_filter_object_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, return EINA_FALSE; } -EOLIAN void +EOLIAN static void _evas_filter_efl_gfx_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd, const char *code, const char *name) { @@ -405,14 +405,14 @@ _evas_filter_efl_gfx_filter_program_set(Eo *eo_obj, Evas_Filter_Data *pd, evas_object_inform_call_resize(eo_obj); } -EOLIAN void +EOLIAN static void _evas_filter_efl_gfx_filter_program_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, const char **code, const char **name) { if (code) *code = pd->data->code; if (name) *name = pd->data->name; } -EOLIAN void +EOLIAN static void _evas_filter_efl_gfx_filter_source_set(Eo *eo_obj, Evas_Filter_Data *pd, const char *name, Efl_Gfx_Base *eo_source) { @@ -499,7 +499,7 @@ update: evas_object_inform_call_resize(eo_obj); } -EOLIAN void +EOLIAN static void _evas_filter_efl_gfx_filter_source_get(const Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, const char *name, Efl_Gfx_Base **source) { @@ -507,7 +507,7 @@ _evas_filter_efl_gfx_filter_source_get(const Eo *eo_obj EINA_UNUSED, Evas_Filter *source = eina_hash_find(pd->data->sources, name); } -EOLIAN void +EOLIAN static void _evas_filter_efl_gfx_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd, const char *cur_state, double cur_val, const char *next_state, double next_val, @@ -546,7 +546,7 @@ _evas_filter_efl_gfx_filter_state_set(Eo *eo_obj, Evas_Filter_Data *pd, } } -EOLIAN void +EOLIAN static void _evas_filter_efl_gfx_filter_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, int *l, int *r, int *t, int *b) { @@ -561,7 +561,7 @@ _evas_filter_efl_gfx_filter_padding_get(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data evas_filter_program_padding_get(pd->data->chain, l, r, t, b); } -EOLIAN void +EOLIAN static void _evas_filter_changed_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val) { if ((evas_object_filter_cow_default != pd->data) && (pd->data->changed != val)) @@ -572,7 +572,7 @@ _evas_filter_changed_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool } } -EOLIAN void +EOLIAN static void _evas_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool val) { if (pd->data->invalid != val) @@ -583,14 +583,14 @@ _evas_filter_invalid_set(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd, Eina_Bool } } -EOLIAN void +EOLIAN static void _evas_filter_constructor(Eo *eo_obj EINA_UNUSED, Evas_Filter_Data *pd) { pd->data = eina_cow_alloc(evas_object_filter_cow); SLKI(pd->lck); } -EOLIAN void +EOLIAN static void _evas_filter_destructor(Eo *eo_obj, Evas_Filter_Data *pd) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS); @@ -626,7 +626,7 @@ _evas_filter_destructor(Eo *eo_obj, Evas_Filter_Data *pd) SLKD(pd->lck); } -EOLIAN void +EOLIAN static void _evas_filter_efl_gfx_filter_data_set(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd, const char *name, const char *value, Eina_Bool execute) @@ -673,7 +673,7 @@ _evas_filter_efl_gfx_filter_data_set(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd, FCOW_END(fcow, pd); } -EOLIAN void * +EOLIAN static void * _evas_filter_output_buffer_get(Eo *obj EINA_UNUSED, Evas_Filter_Data *pd) { return pd->data->output; diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index fecffe6fda..b2fa8cc467 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -3211,19 +3211,19 @@ evas_process_dirty_pixels(Evas_Object *eo_obj, Evas_Object_Protected_Data *obj, return pixels; } -EOLIAN void +EOLIAN static void _evas_image_evas_filter_dirty(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) { o->changed = 1; } -EOLIAN Eina_Bool +EOLIAN static Eina_Bool _evas_image_evas_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o EINA_UNUSED) { return EINA_FALSE; } -EOLIAN Eina_Bool +EOLIAN static Eina_Bool _evas_image_evas_filter_input_render(Eo *eo_obj, Evas_Image_Data *o, void *_filter, void *context, int l, int r EINA_UNUSED, int t, int b EINA_UNUSED, @@ -4977,7 +4977,7 @@ evas_object_image_smooth_scale_get(const Eo *obj) return eo_do_ret((Eo *) obj, ret, efl_image_smooth_scale_get()); } -EOLIAN void +EOLIAN static void _evas_image_efl_gfx_filter_program_set(Eo *obj, Evas_Image_Data *pd EINA_UNUSED, const char *code, const char *name) { pd->has_filter = (code != NULL); diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 46b2039231..41522d8d3c 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -1653,7 +1653,7 @@ evas_font_draw_async_check(Evas_Object_Protected_Data *obj, /* ugly binding between evas_fitler_mixin.c and this object */ -EOLIAN void +EOLIAN static void _evas_text_evas_filter_dirty(Eo *eo_obj, Evas_Text_Data *o) { _evas_object_text_items_clear(o); @@ -1661,13 +1661,13 @@ _evas_text_evas_filter_dirty(Eo *eo_obj, Evas_Text_Data *o) _evas_object_text_recalc(eo_obj, o->cur.text); } -EOLIAN Eina_Bool +EOLIAN static Eina_Bool _evas_text_evas_filter_input_alpha(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o EINA_UNUSED) { return EINA_TRUE; } -EOLIAN Eina_Bool +EOLIAN static Eina_Bool _evas_text_evas_filter_input_render(Eo *eo_obj EINA_UNUSED, Evas_Text_Data *o, void *_filter, void *drawctx, int l, int r EINA_UNUSED, int t, int b EINA_UNUSED, @@ -2325,7 +2325,7 @@ evas_object_text_text_get(const Eo *obj) return eo_do_ret((Eo *) obj, ret, efl_text_get()); } -EOLIAN void +EOLIAN static void _evas_text_efl_gfx_filter_program_set(Eo *obj, Evas_Text_Data *pd EINA_UNUSED, const char *code, const char *name) { pd->has_filter = (code != NULL);