stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=28080ccc046996f5b948e7f93b16b3380e7eb934
commit 28080ccc046996f5b948e7f93b16b3380e7eb934 Author: Elyes HAOUAS <[email protected]> Date: Wed May 13 19:36:06 2020 +0000 tree-wide: get rid of trailing whitespace (last part) Remove trailing whitespaces Reviewed-by: Stefan Schmidt <[email protected]> Differential Revision: https://phab.enlightenment.org/D11832 --- src/modules/wireless/wireless.c | 4 ++-- src/modules/wizard/e_wizard.c | 2 +- src/modules/wizard/page_010.c | 2 +- src/modules/wizard/page_011.c | 2 +- src/modules/wizard/page_040.c | 4 ++-- src/modules/wizard/page_110.c | 4 ++-- src/modules/wizard/page_115.c | 4 ++-- src/modules/wl_drm/e_mod_main.c | 6 +++--- src/modules/wl_fb/e_mod_main.c | 2 +- src/modules/wl_x11/e_mod_main.c | 2 +- src/modules/xwayland/e_mod_main.c | 36 ++++++++++++++++++------------------ src/tests/override_fullscreen.c | 2 +- 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/modules/wireless/wireless.c b/src/modules/wireless/wireless.c index 1328609fd..866339442 100644 --- a/src/modules/wireless/wireless.c +++ b/src/modules/wireless/wireless.c @@ -467,7 +467,7 @@ _wireless_edit_send() break; default: break; } - + } else proxy = EINA_TRUE; @@ -734,7 +734,7 @@ _wireless_gadget_edit_basic(void) elm_object_text_set(hoversel, methods[wc->method]); evas_object_smart_callback_add(hoversel, "clicked", _wireless_gadget_edit_method_open, NULL); } - + ent = entry = _wireless_popup_table_entry_row(tb, _("Address"), NULL, NULL, &row); elm_object_disabled_set(ent, disabled); wireless_popup.entries = eina_list_append(wireless_popup.entries, ent); diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c index 6a871d9cc..ffebaeb6c 100644 --- a/src/modules/wizard/e_wizard.c +++ b/src/modules/wizard/e_wizard.c @@ -151,7 +151,7 @@ wizard_page_show(Evas_Object *obj) if (!obj) return; elm_box_pack_end(o_box, obj); evas_object_show(obj); - + elm_object_focus_set(obj, 1); edje_object_signal_emit(o_bg, "e,action,page,new", "e"); } diff --git a/src/modules/wizard/page_010.c b/src/modules/wizard/page_010.c index 33cff7eb5..5fdc3c33d 100644 --- a/src/modules/wizard/page_010.c +++ b/src/modules/wizard/page_010.c @@ -162,7 +162,7 @@ _lang_content_get(E_Intl_Pair *pair, Evas_Object *obj, const char *part) e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", pair->locale_icon); else e_prefix_data_snprintf(buf, sizeof(buf), "data/flags/%s", "lang-system.png"); - + ic = elm_icon_add(obj); elm_image_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 20, 10); diff --git a/src/modules/wizard/page_011.c b/src/modules/wizard/page_011.c index 2615d70f9..fb08ff1d1 100644 --- a/src/modules/wizard/page_011.c +++ b/src/modules/wizard/page_011.c @@ -196,7 +196,7 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) EINA_LIST_FOREACH(layouts, l, lay) { void *it; - + it = elm_genlist_item_append(ob, &itc, lay, NULL, 0, _layout_select, lay); if (eina_streq(lay->name, "us")) sel_it = it; diff --git a/src/modules/wizard/page_040.c b/src/modules/wizard/page_040.c index b775a641e..348d5e2f5 100644 --- a/src/modules/wizard/page_040.c +++ b/src/modules/wizard/page_040.c @@ -37,13 +37,13 @@ wizard_page_show(E_Wizard_Page *pg EINA_UNUSED) api->wizard_title_set(_("Adding missing App files")); api->wizard_button_next_enable_set(0); api->wizard_page_show(NULL); - + snprintf(buf, sizeof(buf), "%s/extra_desktops", api->wizard_dir_get()); extra_desks = ecore_file_ls(buf); /* advance in 1 sec */ _next_timer = ecore_timer_loop_add(1.0, _next_page, NULL); - + EINA_LIST_FREE(extra_desks, file) { snprintf(buf, sizeof(buf), "%s/extra_desktops/%s", diff --git a/src/modules/wizard/page_110.c b/src/modules/wizard/page_110.c index ef43b7023..5307d6790 100644 --- a/src/modules/wizard/page_110.c +++ b/src/modules/wizard/page_110.c @@ -15,7 +15,7 @@ _recommend_connman(E_Wizard_Page *pg EINA_UNUSED) #if defined(USE_MODULE_CONNMAN) || defined(USE_MODULE_WIRELESS) elm_object_text_set(of, _("Connman network service not found")); - + elm_object_text_set(ob, _("Install/Enable Connman service for network management support")); #else elm_object_text_set(of, _("Connman and Wireless modules disabled")); @@ -93,7 +93,7 @@ _check_connman_owner(void *data, const Eldbus_Message *msg, api->wizard_button_next_enable_set(1); ecore_idler_add(_page_next_call, NULL); return; - + fail: _connman_fail(data); } diff --git a/src/modules/wizard/page_115.c b/src/modules/wizard/page_115.c index a5d17671d..9c2c5408a 100644 --- a/src/modules/wizard/page_115.c +++ b/src/modules/wizard/page_115.c @@ -15,7 +15,7 @@ _recommend_bluez5(E_Wizard_Page *pg EINA_UNUSED) #if defined(USE_MODULE_BLUEZ5) elm_object_text_set(of, _("BlueZ Bluetooth service not found")); - + elm_object_text_set(ob, _("Install/Enable BlueZ 5 / bluetoothd service for network management support")); #else elm_object_text_set(of, _("Bluez5 module disabled")); @@ -93,7 +93,7 @@ _check_bluez5_owner(void *data, const Eldbus_Message *msg, api->wizard_button_next_enable_set(1); ecore_idler_add(_page_next_call, NULL); return; - + fail: _bluez5_fail(data); } diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index 2b2565fbe..10a08ce47 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -105,7 +105,7 @@ _info_unconf_primary_find(E_Randr2 *r) EINA_LIST_FOREACH(r->screens, l, s) { - if (!((s->config.enabled) && + if (!((s->config.enabled) && (s->config.mode.w > 0) && (s->config.mode.h > 0) && (s->config.geom.w > 0) && (s->config.geom.h > 0))) continue; @@ -331,7 +331,7 @@ _drm2_randr_create(void) type = MIN(ecore_drm2_output_connector_type_get(output), EINA_C_ARRAY_LENGTH(conn_types) - 1); s->info.connector = rtype[type]; - s->info.is_lid = ((type == DRM_MODE_CONNECTOR_LVDS) || + s->info.is_lid = ((type == DRM_MODE_CONNECTOR_LVDS) || (type == DRM_MODE_CONNECTOR_eDP)); s->info.lid_closed = (s->info.is_lid && e_acpi_lid_is_closed()); printf("DRM2 RRR: ...... lid_closed = %i (%i && %i)\n", @@ -411,7 +411,7 @@ _drm2_randr_create(void) s->config.mode.w = s->config.geom.w; s->config.mode.h = s->config.geom.h; s->config.mode.refresh = refresh; - s->config.enabled = + s->config.enabled = ((s->config.mode.w != 0) && (s->config.mode.h != 0)); printf("DRM2 RRR: '%s' %i %i %ix%i\n", s->info.name, diff --git a/src/modules/wl_fb/e_mod_main.c b/src/modules/wl_fb/e_mod_main.c index 6bb7206d2..4b2d94929 100644 --- a/src/modules/wl_fb/e_mod_main.c +++ b/src/modules/wl_fb/e_mod_main.c @@ -46,7 +46,7 @@ e_modapi_init(E_Module *m) return m; } -E_API int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { /* shutdown ecore_x */ diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c index e64f02922..d3e43c813 100644 --- a/src/modules/wl_x11/e_mod_main.c +++ b/src/modules/wl_x11/e_mod_main.c @@ -54,7 +54,7 @@ e_modapi_init(E_Module *m) return m; } -E_API int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { /* delete handler for keymap change */ diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c index 4b9b76d71..d02e2b65a 100644 --- a/src/modules/xwayland/e_mod_main.c +++ b/src/modules/xwayland/e_mod_main.c @@ -24,7 +24,7 @@ struct _E_XWayland_Server Ecore_Fd_Handler *abs_hdlr, *unx_hdlr; Ecore_Event_Handler *sig_hdlr; - struct + struct { pid_t pid; /* cleanup_func func; */ @@ -95,7 +95,7 @@ _lock_create(int lock) return 1; } -static int +static int _abstract_socket_bind(int disp) { struct sockaddr_un addr; @@ -103,13 +103,13 @@ _abstract_socket_bind(int disp) int fd; /* try to create a local socket */ - if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0) + if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0) return -1; ecore_file_mkpath("/tmp/.X11-unix"); addr.sun_family = AF_LOCAL; - nsize = snprintf(addr.sun_path, sizeof(addr.sun_path), + nsize = snprintf(addr.sun_path, sizeof(addr.sun_path), "%c/tmp/.X11-unix/X%d", 0, disp); size = offsetof(struct sockaddr_un, sun_path) + nsize; @@ -121,7 +121,7 @@ _abstract_socket_bind(int disp) } /* try to listen on the bound socket */ - if (listen(fd, 1) < 0) + if (listen(fd, 1) < 0) { ERR("Failed to listen to abstract fd: %d", fd); goto err; @@ -134,7 +134,7 @@ err: return -1; } -static int +static int _unix_socket_bind(int disp) { struct sockaddr_un addr; @@ -142,11 +142,11 @@ _unix_socket_bind(int disp) int fd; /* try to create a local socket */ - if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0) + if ((fd = socket(PF_LOCAL, (SOCK_STREAM | SOCK_CLOEXEC), 0)) < 0) return -1; addr.sun_family = AF_LOCAL; - nsize = snprintf(addr.sun_path, sizeof(addr.sun_path), + nsize = snprintf(addr.sun_path, sizeof(addr.sun_path), "/tmp/.X11-unix/X%d", disp) + 1; size = offsetof(struct sockaddr_un, sun_path) + nsize; @@ -160,7 +160,7 @@ _unix_socket_bind(int disp) } /* try to listen on the bound socket */ - if (listen(fd, 1) < 0) + if (listen(fd, 1) < 0) { ERR("Failed to listen to unix fd: %d", fd); goto err; @@ -173,7 +173,7 @@ err: return -1; } -static Eina_Bool +static Eina_Bool _cb_xserver_event(void *data EINA_UNUSED, Ecore_Fd_Handler *hdlr EINA_UNUSED) { int socks[2], wms[2], fd; @@ -298,7 +298,7 @@ xinit(void *d, Ecore_Thread *eth) static void xend(){} -static Eina_Bool +static Eina_Bool _cb_signal_event(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Event_Signal_User *ev; @@ -307,7 +307,7 @@ _cb_signal_event(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) ev = event; if (ev->number != 1) return ECORE_CALLBACK_RENEW; - /* NB: SIGUSR1 comes from XWayland Server when it has finished + /* NB: SIGUSR1 comes from XWayland Server when it has finished * initialized. */ DBG("XWayland Finished Init"); @@ -411,15 +411,15 @@ xwl_init(void *d EINA_UNUSED) ecore_event_add(E_EVENT_COMPOSITOR_XWAYLAND_INIT, NULL, NULL, NULL); /* setup ecore_fd handlers for abstract and unix socket fds */ - exs->abs_hdlr = - ecore_main_fd_handler_add(exs->abs_fd, ECORE_FD_READ, + exs->abs_hdlr = + ecore_main_fd_handler_add(exs->abs_fd, ECORE_FD_READ, _cb_xserver_event, NULL, NULL, NULL); - exs->unx_hdlr = - ecore_main_fd_handler_add(exs->unx_fd, ECORE_FD_READ, + exs->unx_hdlr = + ecore_main_fd_handler_add(exs->unx_fd, ECORE_FD_READ, _cb_xserver_event, NULL, NULL, NULL); /* setup listener for SIGUSR1 */ - exs->sig_hdlr = + exs->sig_hdlr = ecore_event_handler_add(ECORE_EVENT_SIGNAL_USER, _cb_signal_event, exs); return EINA_FALSE; } @@ -464,7 +464,7 @@ e_modapi_init(E_Module *m) return m; } -E_API int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { xwl_shutdown(); diff --git a/src/tests/override_fullscreen.c b/src/tests/override_fullscreen.c index a6adf333c..8d74843a5 100644 --- a/src/tests/override_fullscreen.c +++ b/src/tests/override_fullscreen.c @@ -16,7 +16,7 @@ test_state(void *d EINA_UNUSED) int main(void) { - + ecore_x_init(NULL); --
