forked from enlightenment/efl
Removing more warnings
Using: -Werror -W -Wall -Wextra -Wcast-align -Wchar-subscripts -Wformat -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wreturn-type -Wundef -Wwrite-strings SVN revision: 53683
This commit is contained in:
parent
791f91181e
commit
fff738fbe8
|
@ -391,7 +391,7 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
|
|||
|
||||
//
|
||||
itc_group1 = elm_map_group_class_new(map);
|
||||
elm_map_group_class_data_set(itc_group1, PACKAGE_DATA_DIR"/images/plant_01.jpg");
|
||||
elm_map_group_class_data_set(itc_group1, (void *)PACKAGE_DATA_DIR"/images/plant_01.jpg");
|
||||
|
||||
itc_group2 = elm_map_group_class_new(map);
|
||||
elm_map_group_class_style_set(itc_group2, "radio2");
|
||||
|
@ -399,7 +399,7 @@ test_map(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
|
|||
|
||||
itc_group_parking = elm_map_group_class_new(map);
|
||||
elm_map_group_class_icon_cb_set(itc_group_parking, _group_icon_get);
|
||||
elm_map_group_class_data_set(itc_group_parking, PACKAGE_DATA_DIR"/images/parking.png");
|
||||
elm_map_group_class_data_set(itc_group_parking, (void *)PACKAGE_DATA_DIR"/images/parking.png");
|
||||
elm_map_group_class_style_set(itc_group_parking, "empty");
|
||||
elm_map_group_class_zoom_displayed_set(itc_group_parking, 5);
|
||||
//
|
||||
|
|
|
@ -18,11 +18,12 @@ static Eina_Bool _dir_has_subs(const char *path);
|
|||
static void
|
||||
_tstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__)
|
||||
{
|
||||
char *status;
|
||||
const char *status;
|
||||
|
||||
if (elm_panel_hidden_get((Evas_Object*)data))
|
||||
status = "hidden";
|
||||
else status = "shown";
|
||||
else
|
||||
status = "shown";
|
||||
printf("The top panel is currently %s\n", status);
|
||||
elm_toolbar_item_unselect_all(obj);
|
||||
}
|
||||
|
@ -30,11 +31,12 @@ _tstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__)
|
|||
static void
|
||||
_bstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__)
|
||||
{
|
||||
char *status;
|
||||
const char *status;
|
||||
|
||||
if (elm_panel_hidden_get((Evas_Object*)data))
|
||||
status = "hidden";
|
||||
else status = "shown";
|
||||
else
|
||||
status = "shown";
|
||||
printf("The bottom panel is currently %s\n", status);
|
||||
elm_toolbar_item_unselect_all(obj);
|
||||
}
|
||||
|
|
|
@ -4,15 +4,15 @@
|
|||
|
||||
static Evas_Object *slideshow, *bt_start, *bt_stop;
|
||||
static Elm_Slideshow_Item_Class itc;
|
||||
static char *img1 = PACKAGE_DATA_DIR"/images/logo.png";
|
||||
static char *img2 = PACKAGE_DATA_DIR"/images/plant_01.jpg";
|
||||
static char *img3 = PACKAGE_DATA_DIR"/images/rock_01.jpg";
|
||||
static char *img4 = PACKAGE_DATA_DIR"/images/rock_02.jpg";
|
||||
static char *img5 = PACKAGE_DATA_DIR"/images/sky_01.jpg";
|
||||
static char *img6 = PACKAGE_DATA_DIR"/images/sky_04.jpg";
|
||||
static char *img7 = PACKAGE_DATA_DIR"/images/wood_01.jpg";
|
||||
static char *img8 = PACKAGE_DATA_DIR"/images/mystrale.jpg";
|
||||
static char *img9 = PACKAGE_DATA_DIR"/images/mystrale_2.jpg";
|
||||
static const char *img1 = PACKAGE_DATA_DIR"/images/logo.png";
|
||||
static const char *img2 = PACKAGE_DATA_DIR"/images/plant_01.jpg";
|
||||
static const char *img3 = PACKAGE_DATA_DIR"/images/rock_01.jpg";
|
||||
static const char *img4 = PACKAGE_DATA_DIR"/images/rock_02.jpg";
|
||||
static const char *img5 = PACKAGE_DATA_DIR"/images/sky_01.jpg";
|
||||
static const char *img6 = PACKAGE_DATA_DIR"/images/sky_04.jpg";
|
||||
static const char *img7 = PACKAGE_DATA_DIR"/images/wood_01.jpg";
|
||||
static const char *img8 = PACKAGE_DATA_DIR"/images/mystrale.jpg";
|
||||
static const char *img9 = PACKAGE_DATA_DIR"/images/mystrale_2.jpg";
|
||||
|
||||
static void
|
||||
_notify_show(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
||||
|
|
|
@ -15,7 +15,7 @@ static int current = 0;
|
|||
static Eina_Module *module[2];
|
||||
|
||||
static void
|
||||
_first_city_cb(void *data, Evas_Object *o, void *event_info)
|
||||
_first_city_cb(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
if (!current) return;
|
||||
current = 0;
|
||||
|
@ -23,17 +23,17 @@ _first_city_cb(void *data, Evas_Object *o, void *event_info)
|
|||
}
|
||||
|
||||
static void
|
||||
_second_city_cb(void *data, Evas_Object *o, void *event_info)
|
||||
_second_city_cb(void *dat __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
if (current) return;
|
||||
current = 1;
|
||||
elm_flip_go(fl, ELM_FLIP_ROTATE_XZ_CENTER_AXIS);
|
||||
}
|
||||
|
||||
static void _apply_cb(void *data, Evas_Object *o, void *event_info)
|
||||
static void _apply_cb(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *event_info __UNUSED__)
|
||||
{
|
||||
EWeather *eweather = eweather_object_eweather_get(weather[current]);
|
||||
|
||||
|
||||
if (module[current])
|
||||
eweather_plugin_set(eweather, module[current]);
|
||||
eweather_code_set(eweather, elm_entry_entry_get(en));
|
||||
|
@ -41,11 +41,11 @@ static void _apply_cb(void *data, Evas_Object *o, void *event_info)
|
|||
}
|
||||
|
||||
static void
|
||||
_hover_select_cb(void *data, Evas_Object *obj, void *event_info)
|
||||
_hover_select_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
|
||||
{
|
||||
EWeather *eweather = eweather_object_eweather_get(weather[0]);
|
||||
module[0] = eweather_plugin_search(eweather, elm_hoversel_item_label_get(event_info));
|
||||
|
||||
|
||||
eweather = eweather_object_eweather_get(weather[1]);
|
||||
module[1] = eweather_plugin_search(eweather, elm_hoversel_item_label_get(event_info));
|
||||
printf("%p %p\n", module[0], module[1]);
|
||||
|
@ -62,7 +62,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
|
|||
Eina_Array_Iterator it;
|
||||
Eina_Array *array;
|
||||
Eina_Module *m;
|
||||
int i;
|
||||
unsigned int i;
|
||||
#endif
|
||||
|
||||
win = elm_win_add(NULL, "weather", ELM_WIN_BASIC);
|
||||
|
@ -141,10 +141,10 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
|
|||
evas_object_show(hv);
|
||||
|
||||
array = eweather_plugins_list_get(eweather);
|
||||
|
||||
|
||||
EINA_ARRAY_ITER_NEXT(array, i, m, it)
|
||||
elm_hoversel_item_add(hv, eweather_plugin_name_get(eweather, i), NULL, ELM_ICON_NONE, _hover_select_cb, NULL);
|
||||
|
||||
|
||||
en = elm_entry_add(win);
|
||||
elm_entry_line_wrap_set(en, 0);
|
||||
elm_entry_single_line_set(en, EINA_TRUE);
|
||||
|
|
|
@ -1567,7 +1567,7 @@ elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data,
|
|||
static struct tmpinfo *
|
||||
elm_cnp_tempfile_create(int size){
|
||||
struct tmpinfo *info;
|
||||
char *tmppath;
|
||||
const char *tmppath;
|
||||
int len;
|
||||
|
||||
info = malloc(sizeof(struct tmpinfo));
|
||||
|
|
|
@ -28,9 +28,9 @@ static const char *widtype = NULL;
|
|||
static void _del_hook(Evas_Object *obj);
|
||||
static void _theme_hook(Evas_Object *obj);
|
||||
static void _sizing_eval(Evas_Object *obj);
|
||||
static int _get_value_in_key_string(const char *oldstring, char *key, char **value);
|
||||
static int _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int deleteflag);
|
||||
static int _stringshare_key_value_replace(const char **srcstring, char *key, const char *value, int deleteflag);
|
||||
static int _get_value_in_key_string(const char *oldstring, const char *key, char **value);
|
||||
static int _strbuf_key_value_replace(Eina_Strbuf *srcbuf, const char *key, const char *value, int deleteflag);
|
||||
static int _stringshare_key_value_replace(const char **srcstring, const char *key, const char *value, int deleteflag);
|
||||
static int _is_width_over(Evas_Object *obj);
|
||||
static void _ellipsis_label_to_width(Evas_Object *obj);
|
||||
|
||||
|
@ -128,7 +128,7 @@ _resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event
|
|||
}
|
||||
|
||||
static int
|
||||
_get_value_in_key_string(const char *oldstring, char *key, char **value)
|
||||
_get_value_in_key_string(const char *oldstring, const char *key, char **value)
|
||||
{
|
||||
char *curlocater, *starttag, *endtag;
|
||||
int firstindex = 0, foundflag = -1;
|
||||
|
@ -191,7 +191,7 @@ _get_value_in_key_string(const char *oldstring, char *key, char **value)
|
|||
|
||||
|
||||
static int
|
||||
_strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int deleteflag)
|
||||
_strbuf_key_value_replace(Eina_Strbuf *srcbuf, const char *key, const char *value, int deleteflag)
|
||||
{
|
||||
const char *srcstring = NULL;
|
||||
Eina_Strbuf *repbuf = NULL, *diffbuf = NULL;
|
||||
|
@ -287,7 +287,7 @@ _strbuf_key_value_replace(Eina_Strbuf *srcbuf, char *key, const char *value, int
|
|||
}
|
||||
|
||||
static int
|
||||
_stringshare_key_value_replace(const char **srcstring, char *key, const char *value, int deleteflag)
|
||||
_stringshare_key_value_replace(const char **srcstring, const char *key, const char *value, int deleteflag)
|
||||
{
|
||||
Eina_Strbuf *sharebuf = NULL;
|
||||
|
||||
|
|
|
@ -114,11 +114,11 @@ _icon_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
|
|||
if (!wd->mouse_down) return;
|
||||
edje_object_part_drag_value_get(wd->ms, "elm.swallow.icon", &pos, NULL);
|
||||
if (pos == 0.0)
|
||||
evas_object_smart_callback_call(as, SIG_CHANGED, "left");
|
||||
evas_object_smart_callback_call(as, SIG_CHANGED, (void *)"left");
|
||||
else if (pos == 1.0)
|
||||
evas_object_smart_callback_call(as, SIG_CHANGED, "right");
|
||||
evas_object_smart_callback_call(as, SIG_CHANGED, (void *)"right");
|
||||
else if (pos >= 0.45 && pos <= 0.55)
|
||||
evas_object_smart_callback_call(as, SIG_CHANGED, "center");
|
||||
evas_object_smart_callback_call(as, SIG_CHANGED, (void *)"center");
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -550,7 +550,10 @@ elm_quicklaunch_sub_init(int argc, char **argv)
|
|||
ecore_evas_init(); // FIXME: check errors
|
||||
ecore_imf_init();
|
||||
_elm_module_init();
|
||||
#endif
|
||||
#else
|
||||
(void) argc;
|
||||
(void) argv;
|
||||
#endif
|
||||
return _elm_sub_init_count;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue