From 8d368c1afd842ae15f1ba39b87172902a892e35f Mon Sep 17 00:00:00 2001 From: Jean Sirmai Date: Mon, 30 Sep 2024 15:49:50 +0200 Subject: [PATCH] =?UTF-8?q?names=5Findex.all=20=20plac=C3=A9=20=C3=A0=20la?= =?UTF-8?q?=20racine;=20=C3=A0=20commenter=20avant=20de=20ranger=20par=20o?= =?UTF-8?q?rdre=20alphab=C3=A9tique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/fsm.h | 20 ++++++++++---------- include/names_index.all => names_index.all | 20 ++++++++++---------- src/fsm/dispatch.c | 8 ++++---- src/fsm/measures/manager.c | 4 ++-- src/fsm/measures/tool_list.c | 18 +++++++++--------- src/fsm/preferences/manager.c | 4 ++-- src/fsm/results/manager.c | 2 +- src/util/tests.c | 2 +- 8 files changed, 39 insertions(+), 39 deletions(-) rename include/names_index.all => names_index.all (92%) diff --git a/include/fsm.h b/include/fsm.h index acbdd26..d80afe4 100644 --- a/include/fsm.h +++ b/include/fsm.h @@ -154,10 +154,10 @@ typedef struct fsm_struct_list_disp {int value; struct fsm_struct_list_disp *sui void fsm_init (char *message); // def: fsm/dispatch; call: main; -void fsm_init_list_preferences(); // def: fsm/prefer; call: fsm/dispatch; -void fsm_init_list_measures(); // def: fsm/measure/manage.c; call: fsm/dispatch; -void fsm_init_list_results(); // def: fsm/results; call: fsm/dispatch; -void fsm_init_list_displayables(); // def: fsm/prefer; call: fsm/dispatch; +void fsm_list_init_preferences(); // def: fsm/prefer; call: fsm/dispatch; +void fsm_list_init_measures(); // def: fsm/measure/manage.c; call: fsm/dispatch; +void fsm_list_init_results(); // def: fsm/results; call: fsm/dispatch; +void fsm_list_init_displayables(); // def: fsm/prefer; call: fsm/dispatch; int fsm_get_exec_edit(); // def: fsm/dispatch; call: signal; // widget/state/dispatch; @@ -183,12 +183,12 @@ void fsm_reset_all_situations_transparencies_at_value (int value); // provisoire // --------------------------------------------------------------- WIP ------ // def: measure/tool_list call: measure/tool_list (about the following functions...) -void fsm_tools_list_insert (fsm_struct_list_tool **tl, int value); -int fsm_tools_list_pop (fsm_struct_list_tool **tl); -int fsm_tools_list_length (fsm_struct_list_tool *tl); -void fsm_tools_list_clear (fsm_struct_list_tool **tl); -void fsm_tools_list_view (fsm_struct_list_tool *tl); -void fsm_tools_list_test(); // def: measure/manage; call: measure/manage; +void fsm_list_tools_insert (fsm_struct_list_tool **tl, int value); +int fsm_list_tools_pop (fsm_struct_list_tool **tl); +int fsm_list_tools_length (fsm_struct_list_tool *tl); +void fsm_list_tools_clear (fsm_struct_list_tool **tl); +void fsm_list_tools_view (fsm_struct_list_tool *tl); +void fsm_list_tools_test(); // def: measure/manage; call: measure/manage; // def: fsm/measure/manage/; call: rule exec void fsm_rule_trig_measure (int rule_id, int object_id, int measure_id); diff --git a/include/names_index.all b/names_index.all similarity index 92% rename from include/names_index.all rename to names_index.all index fe018f9..b0c5590 100644 --- a/include/names_index.all +++ b/names_index.all @@ -45,10 +45,10 @@ fsm_journal_publication_request fsm_journal_event fsm_init -fsm_init_list_preferences -fsm_init_list_measures -fsm_init_list_results -fsm_init_list_displayables +fsm_list_init_preferences +fsm_list_init_measures +fsm_list_init_results +fsm_list_init_displayables fsm_get_exec_edit fsm_get_state_rules_data fsm_get_preferences_state @@ -60,12 +60,12 @@ fsm_add_measure fsm_add_result fsm_add_displayable fsm_reset_all_situations_transparencies_at_value -fsm_tools_list_insert -fsm_tools_list_pop -fsm_tools_list_length -fsm_tools_list_clear -fsm_tools_list_view -fsm_tools_list_test +fsm_list_tools_insert +fsm_list_tools_pop +fsm_list_tools_length +fsm_list_tools_clear +fsm_list_tools_view +fsm_list_tools_test fsm_rule_trig_measure fsm_add_data fsm_get_data diff --git a/src/fsm/dispatch.c b/src/fsm/dispatch.c index f38926b..0a88c92 100644 --- a/src/fsm/dispatch.c +++ b/src/fsm/dispatch.c @@ -92,22 +92,22 @@ void fsm_init (char *initial_message_from_main) fsm_journal_event (MESSAGE, FSM, "fsm/dispatch", "measures list init()", "measurement processes"); - fsm_init_list_measures(); + fsm_list_init_measures(); fsm_journal_event (MESSAGE, FSM, "fsm/dispatch", "results list init()", "measurement results (gross)"); - fsm_init_list_results(); + fsm_list_init_results(); fsm_journal_event (MESSAGE, FSM, "fsm/dispatch", "displayables list init()", "displayable results"); - fsm_init_list_displayables(); + fsm_list_init_displayables(); fsm_journal_event (MESSAGE, FSM, "fsm/dispatch", "preferences list init()", "preferences"); - fsm_init_list_preferences(); + fsm_list_init_preferences(); fsm_journal_event (MESSAGE, FSM, "fsm/dispatch", "fsm initialisation", diff --git a/src/fsm/measures/manager.c b/src/fsm/measures/manager.c index 0cdb5fe..c575a0f 100644 --- a/src/fsm/measures/manager.c +++ b/src/fsm/measures/manager.c @@ -96,9 +96,9 @@ void fsm_add_measure (char *measure_name) measure_name); } -void fsm_init_list_measures() +void fsm_list_init_measures() { - if (0) fsm_tools_list_test(); + if (0) fsm_list_tools_test(); fsm_journal_event (DEBUG, RESULTS, diff --git a/src/fsm/measures/tool_list.c b/src/fsm/measures/tool_list.c index 511f69d..c78534c 100644 --- a/src/fsm/measures/tool_list.c +++ b/src/fsm/measures/tool_list.c @@ -69,7 +69,7 @@ //------------------------------------------------------------------------------ -void fsm_tools_list_insert (fsm_struct_list_tool **ml, int value) +void fsm_list_tools_insert (fsm_struct_list_tool **ml, int value) { fsm_struct_list_tool *tmp = NULL; fsm_struct_list_tool *cml = *ml; @@ -142,12 +142,12 @@ void fsm_tools_list_test() fsm_journal_event (DEBUG, MEASURES_TOOLS, "fsm/measure/", "fsm_tools_list_test()", "création d'une liste de 6 elements:"); - fsm_tools_list_insert (&ex_tool,-3); - fsm_tools_list_insert (&ex_tool,5); - fsm_tools_list_insert (&ex_tool,-1); - fsm_tools_list_insert (&ex_tool,4); - fsm_tools_list_insert (&ex_tool,2); - fsm_tools_list_insert (&ex_tool,0); + fsm_list_tools_insert (&ex_tool,-3); + fsm_list_tools_insert (&ex_tool,5); + fsm_list_tools_insert (&ex_tool,-1); + fsm_list_tools_insert (&ex_tool,4); + fsm_list_tools_insert (&ex_tool,2); + fsm_list_tools_insert (&ex_tool,0); fsm_tools_list_view (ex_tool); fsm_journal_event (DEBUG, MEASURES_TOOLS, "fsm/measure/", @@ -159,8 +159,8 @@ void fsm_tools_list_test() fsm_journal_event (DEBUG, MEASURES_TOOLS, "fsm/measure/", "fsm_tools_list_test()", "ajout des 2 elements (3, 1):"); - fsm_tools_list_insert (&ex_tool, 3); - fsm_tools_list_insert (&ex_tool, 1); + fsm_list_tools_insert (&ex_tool, 3); + fsm_list_tools_insert (&ex_tool, 1); fsm_tools_list_view (ex_tool); fsm_tools_list_clear (&ex_tool); diff --git a/src/fsm/preferences/manager.c b/src/fsm/preferences/manager.c index 6ee6df3..5ce31ef 100644 --- a/src/fsm/preferences/manager.c +++ b/src/fsm/preferences/manager.c @@ -129,14 +129,14 @@ void fsm_add_displayable (char *displayable_name) /******************************************************************************/ /* P R E F E R E N C E S */ /******************************************************************************/ -void fsm_init_list_preferences() +void fsm_list_init_preferences() { fsm_journal_event (MESSAGE, PREFER, "fsm/preferences/manager", "fsm preferences list is ready to use", "(double chained)"); } -void fsm_init_list_displayables() +void fsm_list_init_displayables() { fsm_journal_event (MESSAGE, PREFER, "fsm/preferences/manager", "fsm displayables list is ready to use", diff --git a/src/fsm/results/manager.c b/src/fsm/results/manager.c index 0052814..eafd4e8 100644 --- a/src/fsm/results/manager.c +++ b/src/fsm/results/manager.c @@ -68,7 +68,7 @@ void fsm_add_result (char *result_name) printf("fsm_add_result %p <<< %s (see fsm.c)\n", list_results, result_name); } -void fsm_init_list_results () +void fsm_list_init_results () { fsm_journal_event (DEBUG, RESULTS, diff --git a/src/util/tests.c b/src/util/tests.c index 54c24ce..2eefe24 100644 --- a/src/util/tests.c +++ b/src/util/tests.c @@ -34,7 +34,7 @@ void util_trigger_test () { - if (0) fsm_tools_list_test(); + if (0) fsm_list_tools_test(); if (0) util_pile_test(); if (0) util_double_list_test(); if (0) util_sorted_list_test();