From 162e6b7a4185b8bdf5f8b9bd97238cdaedc1dddb Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Sat, 23 May 2020 13:51:26 +0100 Subject: [PATCH] style: improve indentation (function params). --- src/bin/main.c | 5 +- src/bin/system/machine.c | 38 ++++++++-------- src/bin/ui/ui.c | 88 ++++++++++++++++++++++++------------ src/bin/ui/ui_cache.c | 3 +- src/bin/ui/ui_process_view.c | 33 +++++++++----- src/bin/ui/ui_process_view.h | 11 +++-- 6 files changed, 109 insertions(+), 69 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index a09486a..aadf24e 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -9,7 +9,8 @@ #include "ui/ui.h" static void -_win_del_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_win_del_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { exit(0); } @@ -25,7 +26,7 @@ _win_add(void) icon = elm_icon_add(win); elm_icon_standard_set(icon, "evisum"); elm_win_icon_object_set(win, icon); - evas_object_resize(win, EVISUM_SIZE_WIDTH * elm_config_scale_get(), + evas_object_resize(win, EVISUM_SIZE_WIDTH * elm_config_scale_get(), EVISUM_SIZE_HEIGHT * elm_config_scale_get()); elm_win_title_set(win, _("Evisum: System Monitor")); elm_win_center(win, EINA_TRUE, EINA_TRUE); diff --git a/src/bin/system/machine.c b/src/bin/system/machine.c index 2e18a88..45228ff 100644 --- a/src/bin/system/machine.c +++ b/src/bin/system/machine.c @@ -1,26 +1,26 @@ /* - Copyright (c) 2017, Al Poole - All rights reserved. + Copyright (c) 2017, Al Poole + All rights reserved. - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: - 1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. + 1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #define _DEFAULT_SOURCE diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index cd20d19..b833705 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -292,7 +292,8 @@ _proc_pid_cpu_usage_get(Ui *ui, Proc_Info *proc) { if (tmp->cpu_time_prev && proc->cpu_time > tmp->cpu_time_prev) { - proc->cpu_usage = (double) (proc->cpu_time - tmp->cpu_time_prev) / + proc->cpu_usage = + (double) (proc->cpu_time - tmp->cpu_time_prev) / ui->poll_delay; } _proc_pid_cpu_time_save(ui, proc); @@ -304,7 +305,8 @@ _proc_pid_cpu_usage_get(Ui *ui, Proc_Info *proc) } static void -_item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui; Evas_Object *o; @@ -489,7 +491,8 @@ _genlist_ensure_n_items(Evas_Object *genlist, unsigned int items) for (i = existing; i < items; i++) { - elm_genlist_item_append(genlist, itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_append(genlist, itc, NULL, NULL, + ELM_GENLIST_ITEM_NONE, NULL, NULL); } elm_genlist_item_class_free(itc); @@ -510,7 +513,8 @@ _bring_in(Ui *ui) } static void -_process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void *msg EINA_UNUSED) +_process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, + void *msg EINA_UNUSED) { Ui *ui; Eina_List *list, *l, *l_next; @@ -526,8 +530,8 @@ _process_list_feedback_cb(void *data, Ecore_Thread *thread EINA_UNUSED, void *ms EINA_LIST_FOREACH_SAFE(list, l, l_next, proc) { if ((ui->search_text && ui->search_text[0] && - strncasecmp(proc->command, ui->search_text, strlen(ui->search_text))) || - (!ui->show_self && proc->pid == ui->program_pid)) + strncasecmp(proc->command, ui->search_text, strlen(ui->search_text)) + ) || (!ui->show_self && proc->pid == ui->program_pid)) { proc_info_free(proc); list = eina_list_remove_list(list, l); @@ -612,7 +616,8 @@ _btn_icon_state_set(Evas_Object *button, Eina_Bool reverse) } static void -_btn_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -630,7 +635,8 @@ _btn_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info E } static void -_btn_uid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_uid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -648,7 +654,8 @@ _btn_uid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info E } static void -_btn_cpu_usage_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_cpu_usage_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -666,7 +673,8 @@ _btn_cpu_usage_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_ } static void -_btn_size_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_size_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -684,7 +692,8 @@ _btn_size_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info } static void -_btn_rss_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_rss_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -702,7 +711,8 @@ _btn_rss_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info E } static void -_btn_cmd_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_cmd_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -720,7 +730,8 @@ _btn_cmd_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info E } static void -_btn_state_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_state_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -738,13 +749,15 @@ _btn_state_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info } static void -_btn_quit_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_quit_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { exit(0); } static void -_item_menu_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj, void *ev EINA_UNUSED) +_item_menu_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj, + void *ev EINA_UNUSED) { Ui *ui = data; @@ -754,7 +767,8 @@ _item_menu_dismissed_cb(void *data EINA_UNUSED, Evas_Object *obj, void *ev EINA_ } static void -_item_menu_start_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_item_menu_start_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Proc_Info *proc; @@ -765,7 +779,8 @@ _item_menu_start_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info E } static void -_item_menu_stop_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_item_menu_stop_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Proc_Info *proc; @@ -776,7 +791,8 @@ _item_menu_stop_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EI } static void -_item_menu_kill_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_item_menu_kill_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Proc_Info *proc; @@ -787,7 +803,8 @@ _item_menu_kill_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EI } static void -_item_menu_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_item_menu_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -796,7 +813,8 @@ _item_menu_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info } static void -_item_menu_priority_increase_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_item_menu_priority_increase_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Proc_Info *proc = data; if (!proc) return; @@ -805,7 +823,8 @@ _item_menu_priority_increase_cb(void *data, Evas_Object *obj EINA_UNUSED, void * } static void -_item_menu_priority_decrease_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_item_menu_priority_decrease_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Proc_Info *proc = data; if (!proc) return; @@ -814,7 +833,8 @@ _item_menu_priority_decrease_cb(void *data, Evas_Object *obj EINA_UNUSED, void * } static void -_item_menu_priority_add(Evas_Object *menu, Elm_Object_Item *menu_it, Proc_Info *proc) +_item_menu_priority_add(Evas_Object *menu, Elm_Object_Item *menu_it, + Proc_Info *proc) { Elm_Object_Item *it; @@ -858,7 +878,8 @@ _item_menu_create(Ui *ui, Proc_Info *proc) } static void -_item_pid_secondary_clicked_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) +_item_pid_secondary_clicked_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, + Evas_Object *obj, void *event_info) { Evas_Object *menu; Evas_Event_Mouse_Up *ev; @@ -1140,7 +1161,8 @@ _tab_state_changed(Ui *ui, Evas_Object *btn_active, Evas_Object *view) } static void -_tab_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_tab_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -1150,7 +1172,8 @@ _tab_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void * } static void -_tab_system_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_tab_system_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -1160,7 +1183,8 @@ _tab_system_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void * } static void -_tab_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_tab_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -1170,7 +1194,8 @@ _tab_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *ev } static void -_tab_misc_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_tab_misc_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -1180,7 +1205,8 @@ _tab_misc_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info } static void -_tab_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_tab_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui *ui = data; @@ -1199,7 +1225,8 @@ _evisum_process_filter(Ui *ui, const char *text) } static void -_evisum_search_keypress_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info) +_evisum_search_keypress_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, + void *event_info) { Ui * ui; const char *markup; @@ -1529,7 +1556,8 @@ evisum_ui_shutdown(Ui *ui) if (ui->cpu_list) eina_list_free(ui->cpu_list); - evisum_ui_item_cache_free(ui->cache); + if (ui->cache) + evisum_ui_item_cache_free(ui->cache); eina_lock_free(&_lock); } diff --git a/src/bin/ui/ui_cache.c b/src/bin/ui/ui_cache.c index d4f59a1..afefba6 100644 --- a/src/bin/ui/ui_cache.c +++ b/src/bin/ui/ui_cache.c @@ -1,7 +1,8 @@ #include "ui_cache.h" Evisum_Ui_Cache * -evisum_ui_item_cache_new(Evas_Object *parent, Evas_Object *(create_cb)(Evas_Object *), int size) +evisum_ui_item_cache_new(Evas_Object *parent, + Evas_Object *(create_cb)(Evas_Object *), int size) { Evisum_Ui_Cache *cache = malloc(sizeof(Evisum_Ui_Cache)); if (!cache) return NULL; diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c index 9a852bc..56682d1 100644 --- a/src/bin/ui/ui_process_view.c +++ b/src/bin/ui/ui_process_view.c @@ -49,7 +49,8 @@ _exe_response(const char *command) } static void -_item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_item_unrealized_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui_Process *ui; Evas_Object *o; @@ -356,7 +357,8 @@ _proc_info_update(void *data) ecore_timer_del(ui->timer_pid); ui->timer_pid = NULL; - _win_title_set(ui->win, _("%s (%d) - Not running"), ui->selected_cmd, ui->selected_pid); + _win_title_set(ui->win, _("%s (%d) - Not running"), ui->selected_cmd, + ui->selected_pid); return ECORE_CALLBACK_CANCEL; } @@ -402,7 +404,8 @@ _proc_info_update(void *data) } static void -_btn_start_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_start_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui_Process *ui = data; @@ -413,7 +416,8 @@ _btn_start_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info } static void -_btn_stop_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_stop_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui_Process *ui = data; @@ -424,7 +428,8 @@ _btn_stop_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info } static void -_btn_kill_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_kill_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui_Process *ui = data; @@ -637,7 +642,7 @@ _btn_icon_state_set(Evas_Object *button, Eina_Bool reverse) static void _btn_name_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, - void *event_info EINA_UNUSED) + void *event_info EINA_UNUSED) { Ui_Process *ui = data; @@ -663,7 +668,7 @@ _btn_thread_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, static void _btn_state_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, - void *event_info EINA_UNUSED) + void *event_info EINA_UNUSED) { Ui_Process *ui = data; @@ -689,7 +694,7 @@ _btn_cpu_id_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, static void _btn_cpu_usage_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, - void *event_info EINA_UNUSED) + void *event_info EINA_UNUSED) { Ui_Process *ui = data; @@ -826,7 +831,8 @@ _hide_all(Ui_Process *ui, Evas_Object *btn) } static void -_btn_process_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_process_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui_Process *ui; @@ -837,7 +843,8 @@ _btn_process_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_in } static void -_btn_threads_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_threads_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui_Process *ui; @@ -849,7 +856,8 @@ _btn_threads_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_in } static void -_btn_info_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_btn_info_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Ui_Process *ui; char *line; @@ -972,7 +980,8 @@ _tabs_add(Evas_Object *parent, Ui_Process *ui) } static void -_win_del_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_win_del_cb(void *data, Evas_Object *obj EINA_UNUSED, + void *event_info EINA_UNUSED) { Evas_Object *win; Ui_Process *ui; diff --git a/src/bin/ui/ui_process_view.h b/src/bin/ui/ui_process_view.h index 8aed51c..e382a4a 100644 --- a/src/bin/ui/ui_process_view.h +++ b/src/bin/ui/ui_process_view.h @@ -8,15 +8,16 @@ typedef struct _Ui_Process { Evas_Object *win; Evas_Object *content; - Evas_Object *main_view; - Evas_Object *info_view; - Evas_Object *thread_view; - Evas_Object *btn_main; Evas_Object *btn_info; Evas_Object *btn_thread; - Evas_Object *entry_info; + Evas_Object *main_view; + Evas_Object *info_view; + Evas_Object *thread_view; + + Evas_Object *entry_info; + Evas_Object *genlist_threads; Evisum_Ui_Cache *cache;