Cleanup: Miscellaneous things.

diff --git a/data/build/fakefile b/data/build/fakefile
index 2c640099992eb2252b6be956f6202ef54aeba28a..1018e1a42bc57152a65a0ec3800c9570eafe2186 100644 (file)
--- a/data/build/fakefile
+++ b/data/build/fakefile
@@ -39,13 +39,13 @@ help:
 
   print
   print The following operations are available\:
-  print "  - context:'notable'help:context:'reset'               Perform the help operation, printing this message."
-  print "  - context:'notable'install:context:'reset'            A helper operation that calls the ./install.sh script for both the controller and init programs."
-  print "  - context:'notable'install_controller:context:'reset' A helper operation that calls the ./install.sh script for the controller program."
-  print "  - context:'notable'install_init:context:'reset'       A helper operation that calls the ./install.sh script for the init program."
-  print "  - context:'notable'main:context:'reset'               Compilation using the build settings mode for both the controller and init programs (default)."
-  print "  - context:'notable'main_controller:context:'reset'    Compilation using the build settings mode for the controller program."
-  print "  - context:'notable'main_init:context:'reset'          Compilation using the build settings mode for the init program."
+  print "  - context:'notable'help:context:'reset'                Perform the help operation, printing this message."
+  print "  - context:'notable'install:context:'reset'             A helper operation that calls the ./install.sh script for both the controller and init programs."
+  print "  - context:'notable'install_controller:context:'reset'  A helper operation that calls the ./install.sh script for the controller program."
+  print "  - context:'notable'install_init:context:'reset'        A helper operation that calls the ./install.sh script for the init program."
+  print "  - context:'notable'main:context:'reset'                Compilation using the build settings mode for both the controller and init programs (default)."
+  print "  - context:'notable'main_controller:context:'reset'     Compilation using the build settings mode for the controller program."
+  print "  - context:'notable'main_init:context:'reset'           Compilation using the build settings mode for the init program."
 
   print
   print The context:'notable'install context:'reset'operation supports the context:'notable'work,context:'reset' context:'notable'verbosity,context:'reset' and context:'notable'color context:'reset'parameters.

diff --git a/data/build/stand_alone/fakefile b/data/build/stand_alone/fakefile
index 0e8456c832c3d29775e93cb1f6281a4b5bb2b389..a77cc9e142bfe486366d773c71df730d2a2d195c 100644 (file)
--- a/data/build/stand_alone/fakefile
+++ b/data/build/stand_alone/fakefile
@@ -1,11 +1,11 @@
 # fss-0005 iki-0002
 #
-# This requires the FLL sources to be placed along this projects sources.
-#
 # See the dependencies file for details on the FLL packages that are needed.
 #
-# The build settings file must be updated with all of the appropriate paths from the FLL source files.
-# These source files must be copied over into the sources directory under 'sources/c/fll'.
+# The data/build/stand_alone/config.h should be copied to sources/c/config.h.
+#
+# This requires that the sources structure to be changed.
+# The monolithic sources from within the 'fll-0.7.0/source/c/' directory must be copied over into the sources directory under the directory 'sources/c/fll/'.
 #
 # This can be built via:
 #   fake -U build/stand_alone/ clean make

diff --git a/data/build/stand_alone/settings.controller b/data/build/stand_alone/settings.controller
index 5642252b861e4f3d0ea597888146871057cd67ee..0c0ed0b3e2052d34e5df69d1d1aee7cb20e46b27 100644 (file)
--- a/data/build/stand_alone/settings.controller
+++ b/data/build/stand_alone/settings.controller
@@ -2,14 +2,8 @@
 #
 # See the fakefile for details about the stand alone build.
 #
-# This requires that the sources structure to be changed.
-# The FLL sources from the monolithic package must be dropped into the sources directory under the fll sub-directory (which must be created).
-# The Controller sources must be dropped into the sources directory under the program sub-directory (which must be created).
-#
-# The data/build/stand_alone/config.h should be copied to sources/c/config.h.
-#
 # This can be built directly via:
-#    fake -s data/build/stand_alone/settings.controller clean build
+#   fake -s data/build/stand_alone/settings.controller clean build
 #
 # Modes:
 #   - clang:       Use clang rather than the default, which is generally GCC.

diff --git a/sources/c/program/controller/main/common/enumeration.h b/sources/c/program/controller/main/common/enumeration.h
index b2e1eb5659a5077085cce55461f69504fc429e9f..ba5b38a34210ee1c064584885734d165f6bebe2f 100644 (file)
--- a/sources/c/program/controller/main/common/enumeration.h
+++ b/sources/c/program/controller/main/common/enumeration.h
@@ -35,7 +35,6 @@ extern "C" {
  *   - validate:               Perform validation of rules rather than execution.
  *   - version:                Print version.
  *   - version_copyright_help: A helper flag representing version, copyright, and help flag bits being set.
- *   - warning:                Check if status is "warning".
  */
 #ifndef _di_controller_main_flag_e_
   enum {
@@ -52,7 +51,6 @@ extern "C" {
     controller_main_flag_validate_e               = 0x200,
     controller_main_flag_version_e                = 0x400,
     controller_main_flag_version_copyright_help_e = 0x411,
-    controller_main_flag_warning_e                = 0x800,
   }; // enum
 #endif // _di_controller_main_flag_e_
 

diff --git a/sources/c/program/controller/main/common/type.c b/sources/c/program/controller/main/common/type.c
index 56e53d3b45803bda17b74ba30dad1b4f98621fe2..bd3b0ca0c10c836ea9ba3481e6f58c8d3c95d7af 100644 (file)
--- a/sources/c/program/controller/main/common/type.c
+++ b/sources/c/program/controller/main/common/type.c
@@ -5,15 +5,15 @@ extern "C" {
 #endif
 
 #ifndef _di_controller_delete_
-  void controller_delete(controller_t * const main) {
+  void controller_delete(controller_t * const controller) {
 
-    if (!main) return;
+    if (!controller) return;
 
-    fll_program_data_delete(&main->program);
+    fll_program_data_delete(&controller->program);
 
-    controller_process_delete(&main->process);
-    controller_setting_delete(&main->setting);
-    controller_thread_delete(&main->thread);
+    controller_process_delete(&controller->process);
+    controller_setting_delete(&controller->setting);
+    controller_thread_delete(&controller->thread);
   }
 #endif // _di_controller_delete_
 

diff --git a/sources/c/program/controller/main/common/type.h b/sources/c/program/controller/main/common/type.h
index 1a12297d6c7793f517e9a9ce2cce74b76e40786a..7eedbbf2bf6ae36b9ff95c2f9cd527351554285f 100644 (file)
--- a/sources/c/program/controller/main/common/type.h
+++ b/sources/c/program/controller/main/common/type.h
@@ -103,10 +103,10 @@ extern "C" {
 #endif // _di_controller_t_
 
 /**
- * De-allocate main program data.
+ * De-allocate controller data.
  *
- * @param main
- *   The main program data.
+ * @param controller
+ *   The controller data.
  *
  *   Must not be NULL.
  *
@@ -120,7 +120,7 @@ extern "C" {
  * @see fll_program_data_delete()
  */
 #ifndef _di_controller_delete_
-  extern void controller_delete(controller_t * const main);
+  extern void controller_delete(controller_t * const controller);
 #endif // _di_controller_delete_
 
 /**

diff --git a/sources/c/program/controller/main/print/message.c b/sources/c/program/controller/main/print/message.c
index 7b721ebea90f203f28ffb0c4138a6bb82a31249e..4b58787bece927c2fdaf591bb76a189f84636b18 100644 (file)
--- a/sources/c/program/controller/main/print/message.c
+++ b/sources/c/program/controller/main/print/message.c
@@ -7,9 +7,7 @@ extern "C" {
 #ifndef _di_controller_print_message_help_
   f_status_t controller_print_message_help(fl_print_t * const print, const uint8_t uninterrupt) {
 
-    if (!print || !print->custom) return F_status_set_error(F_output_not);
-
-    controller_t * const main = (controller_t *) print->custom;
+    if (!print) return F_status_set_error(F_output_not);
 
     f_file_stream_lock(print->to);