From 46666de75d5469a7da5252967ab41e92eabf0880 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 20 Apr 2016 11:16:22 -0400 Subject: [PATCH] ecore-wl2: return some copied code back to its original state this will make future rebases easier --- src/lib/ecore_wl2/ecore_wl2_dnd.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_dnd.c b/src/lib/ecore_wl2/ecore_wl2_dnd.c index 439ca8f..adfabed 100644 --- a/src/lib/ecore_wl2/ecore_wl2_dnd.c +++ b/src/lib/ecore_wl2/ecore_wl2_dnd.c @@ -44,19 +44,15 @@ struct _dnd_read_ctx }; static void -_offer_cb_offer(void *data, struct wl_data_offer *offer EINA_UNUSED, const char *type) +data_offer_offer(void *data, struct wl_data_offer *wl_data_offer EINA_UNUSED, const char *type) { - Ecore_Wl2_Dnd_Source *source; - char **t; - - source = data; - if ((!source) || (!type)) return; + Ecore_Wl2_Dnd_Source *source = data; + char **p; - t = wl_array_add(&source->types, sizeof(*t)); - if (t) *t = strdup(type); + p = wl_array_add(&source->types, sizeof *p); + *p = strdup(type); } - static void data_offer_source_actions(void *data, struct wl_data_offer *wl_data_offer EINA_UNUSED, uint32_t source_actions) { @@ -75,7 +71,7 @@ data_offer_action(void *data, struct wl_data_offer *wl_data_offer EINA_UNUSED, u static const struct wl_data_offer_listener _offer_listener = { - _offer_cb_offer, + data_offer_offer, data_offer_source_actions, data_offer_action }; -- 2.7.4