Cleanup: Sloppy use of "main" inside of "main()", oops.

I cannot believe I let this one slip through (and so did the compilers).

When I refactored "data" to be "main" this included the refactor in the function called "main".

This is dangerous at worst and at best bad practice.
Given that "data" is no longer to be used in the main(), just rename the uses of "main" back to "data" for the variable name only (not the typedef structure name).

diff --git a/level_3/byte_dump/c/main.c b/level_3/byte_dump/c/main.c
index b6dc21c5da61885dac7f7c3c396a26ded55dd27c..d399fda00ba6d9ce3b71e25db5508556307d2a03 100644 (file)
--- a/level_3/byte_dump/c/main.c
+++ b/level_3/byte_dump/c/main.c
@@ -1,14 +1,15 @@
 #include "byte_dump.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  byte_dump_main_t main = byte_dump_main_t_initialize;
+  byte_dump_main_t data = byte_dump_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = byte_dump_main(arguments, &main);
+  const f_status_t status = byte_dump_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/control/c/main.c b/level_3/control/c/main.c
index 9095f461c29b57351c6118c23508b6b4192591d9..63db5c83f324294f174ff063405d53ddb0f5bd38 100644 (file)
--- a/level_3/control/c/main.c
+++ b/level_3/control/c/main.c
@@ -1,14 +1,15 @@
 #include "control.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  control_main_t main = control_data_initialize;
+  control_main_t data = control_data_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = control_main(arguments, &main);
+  const f_status_t status = control_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/controller/c/main.c b/level_3/controller/c/main.c
index a9cb379551066055d515fc59eac14f1097e7726b..1f00632cb67dbef6f6256f9e3d241c44e1262540 100644 (file)
--- a/level_3/controller/c/main.c
+++ b/level_3/controller/c/main.c
@@ -1,39 +1,40 @@
 #include "controller.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  controller_main_t main = controller_main_t_initialize;
+  controller_main_t data = controller_main_t_initialize;
   f_status_t status = F_none;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  main.pid = getpid();
+  data.pid = getpid();
 
-  f_signal_set_empty(&main.signal.set);
-  f_signal_set_add(F_signal_abort, &main.signal.set);
-  f_signal_set_add(F_signal_hangup, &main.signal.set);
-  f_signal_set_add(F_signal_interrupt, &main.signal.set);
-  f_signal_set_add(F_signal_quit, &main.signal.set);
-  f_signal_set_add(F_signal_termination, &main.signal.set);
-  f_signal_mask(SIG_BLOCK, &main.signal.set, 0);
+  f_signal_set_empty(&data.signal.set);
+  f_signal_set_add(F_signal_abort, &data.signal.set);
+  f_signal_set_add(F_signal_hangup, &data.signal.set);
+  f_signal_set_add(F_signal_interrupt, &data.signal.set);
+  f_signal_set_add(F_signal_quit, &data.signal.set);
+  f_signal_set_add(F_signal_termination, &data.signal.set);
+  f_signal_mask(SIG_BLOCK, &data.signal.set, 0);
 
-  status = f_signal_open(&main.signal);
+  status = f_signal_open(&data.signal);
 
   // if there is an error opening a signal descriptor, then do not handle signals.
   if (F_status_is_error(status)) {
-    f_signal_mask(SIG_UNBLOCK, &main.signal.set, 0);
-    f_signal_close(&main.signal);
+    f_signal_mask(SIG_UNBLOCK, &data.signal.set, 0);
+    f_signal_close(&data.signal);
   }
 
   // @fixme: bad design in POSIX where there is no get umask without setting it.
-  main.umask = umask(0);
+  data.umask = umask(0);
 
   // restore umask.
-  umask(main.umask);
+  umask(data.umask);
 
-  status = controller_main(arguments, &main);
+  status = controller_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);
@@ -44,10 +45,10 @@ int main(const int argc, const f_string_t *argv) {
   close(f_type_descriptor_input);
   close(f_type_descriptor_error);
 
-  f_signal_close(&main.signal);
+  f_signal_close(&data.signal);
 
   if (status == F_child) {
-    exit(main.child);
+    exit(data.child);
   }
 
   if (F_status_is_error(status)) {

diff --git a/level_3/fake/c/main.c b/level_3/fake/c/main.c
index b11290ceeb40bfc23e23c64ffd5844316812bc1a..098bf6aae036b1b45e19917c75bd914add72433e 100644 (file)
--- a/level_3/fake/c/main.c
+++ b/level_3/fake/c/main.c
@@ -15,36 +15,37 @@
  * @see exit()
  */
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fake_main_t main = fake_main_t_initialize;
+  fake_main_t data = fake_main_t_initialize;
   f_status_t status = F_none;
 
-  f_signal_set_empty(&main.signal.set);
-  f_signal_set_add(F_signal_abort, &main.signal.set);
-  f_signal_set_add(F_signal_hangup, &main.signal.set);
-  f_signal_set_add(F_signal_interrupt, &main.signal.set);
-  f_signal_set_add(F_signal_quit, &main.signal.set);
-  f_signal_set_add(F_signal_termination, &main.signal.set);
+  f_signal_set_empty(&data.signal.set);
+  f_signal_set_add(F_signal_abort, &data.signal.set);
+  f_signal_set_add(F_signal_hangup, &data.signal.set);
+  f_signal_set_add(F_signal_interrupt, &data.signal.set);
+  f_signal_set_add(F_signal_quit, &data.signal.set);
+  f_signal_set_add(F_signal_termination, &data.signal.set);
 
-  status = f_signal_mask(SIG_BLOCK, &main.signal.set, 0);
+  status = f_signal_mask(SIG_BLOCK, &data.signal.set, 0);
 
   if (F_status_is_error_not(status)) {
-    status = f_signal_open(&main.signal);
+    status = f_signal_open(&data.signal);
 
     // if there is an error opening a signal descriptor, then do not handle signals.
     if (F_status_is_error(status)) {
-      f_signal_mask(SIG_UNBLOCK, &main.signal.set, 0);
-      f_signal_close(&main.signal);
+      f_signal_mask(SIG_UNBLOCK, &data.signal.set, 0);
+      f_signal_close(&data.signal);
     }
   }
 
   // @fixme: bad design in POSIX where there is no get umask without setting it.
-  main.umask = umask(0);
+  data.umask = umask(0);
 
   // restore umask.
-  umask(main.umask);
+  umask(data.umask);
 
-  status = fake_main(arguments, &main);
+  status = fake_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);
@@ -55,10 +56,10 @@ int main(const int argc, const f_string_t *argv) {
   close(f_type_descriptor_input);
   close(f_type_descriptor_error);
 
-  f_signal_close(&main.signal);
+  f_signal_close(&data.signal);
 
   if (status == F_child) {
-    exit(main.child);
+    exit(data.child);
   }
 
   if (F_status_is_error(status)) {

diff --git a/level_3/firewall/c/main.c b/level_3/firewall/c/main.c
index b0bd369b385f2087a5c33d576221b98af7e210b1..6b3f60bdc10f65153ada8d27ed81438763ac7065 100644 (file)
--- a/level_3/firewall/c/main.c
+++ b/level_3/firewall/c/main.c
@@ -1,14 +1,15 @@
 #include "firewall.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  firewall_main_t main = firewall_main_t_initialize;
+  firewall_main_t data = firewall_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  if (F_status_is_error(firewall_main(arguments, &main))) {
+  if (F_status_is_error(firewall_main(arguments, &data))) {
     return 1;
   }
 

diff --git a/level_3/fss_basic_list_read/c/main.c b/level_3/fss_basic_list_read/c/main.c
index 9881dcf05fb7abf2e26aa3a74e82b000eb6251a5..c5196380512e7be39439398315f7d3214aef7725 100644 (file)
--- a/level_3/fss_basic_list_read/c/main.c
+++ b/level_3/fss_basic_list_read/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_basic_list_read.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_basic_list_read_main_t main = fss_basic_list_read_main_t_initialize;
+  fss_basic_list_read_main_t data = fss_basic_list_read_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_basic_list_read_main(arguments, &main);
+  const f_status_t status = fss_basic_list_read_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_basic_list_write/c/main.c b/level_3/fss_basic_list_write/c/main.c
index b4e82b4d47318a008d07b276ec8a57dbb6601b7a..48f6234c92a08e2684190d336ad98bc7dea7027b 100644 (file)
--- a/level_3/fss_basic_list_write/c/main.c
+++ b/level_3/fss_basic_list_write/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_basic_list_write.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_basic_list_write_main_t main = fss_basic_list_write_main_t_initialize;
+  fss_basic_list_write_main_t data = fss_basic_list_write_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_basic_list_write_main(arguments, &main);
+  const f_status_t status = fss_basic_list_write_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_basic_read/c/main.c b/level_3/fss_basic_read/c/main.c
index efe4f0c9c31d6f0b0fc8ab7b042d8f8398097d91..844654a0a73cae9f16c76096a2a7921a01de4db2 100644 (file)
--- a/level_3/fss_basic_read/c/main.c
+++ b/level_3/fss_basic_read/c/main.c
@@ -3,13 +3,13 @@
 int main(const int argc, const f_string_t *argv) {
 
   f_console_arguments_t arguments = { argc, argv };
-  fss_basic_read_main_t main = fss_basic_read_main_t_initialize;
+  fss_basic_read_main_t data = fss_basic_read_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_basic_read_main(&arguments, &main);
+  const f_status_t status = fss_basic_read_main(&arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_basic_write/c/main.c b/level_3/fss_basic_write/c/main.c
index ef09cb480fed4e14552d23571983c0796762d6b0..32526c10d781f6544a5eadc80af0eced3066d16c 100644 (file)
--- a/level_3/fss_basic_write/c/main.c
+++ b/level_3/fss_basic_write/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_basic_write.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_basic_write_main_t main = fss_basic_write_main_t_initialize;
+  fss_basic_write_main_t data = fss_basic_write_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_basic_write_main(arguments, &main);
+  const f_status_t status = fss_basic_write_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_embedded_list_read/c/main.c b/level_3/fss_embedded_list_read/c/main.c
index 850895bcfae98cbda204961749f3612f93904941..0497df58dafd629a7561120091e9759dc3a0f5fa 100644 (file)
--- a/level_3/fss_embedded_list_read/c/main.c
+++ b/level_3/fss_embedded_list_read/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_embedded_list_read.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_embedded_list_read_main_t main = fss_embedded_list_read_main_t_initialize;
+  fss_embedded_list_read_main_t data = fss_embedded_list_read_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_embedded_list_read_main(arguments, &main);
+  const f_status_t status = fss_embedded_list_read_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_embedded_list_write/c/main.c b/level_3/fss_embedded_list_write/c/main.c
index c236863d4e6a4f24c6a954ea1f40ef5c2ed5a1fe..d7f0a30957178636d65f68a3eebf9539b0f0f720 100644 (file)
--- a/level_3/fss_embedded_list_write/c/main.c
+++ b/level_3/fss_embedded_list_write/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_embedded_list_write.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_embedded_list_write_main_t main = fss_embedded_list_write_main_t_initialize;
+  fss_embedded_list_write_main_t data = fss_embedded_list_write_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_embedded_list_write_main(arguments, &main);
+  const f_status_t status = fss_embedded_list_write_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_extended_list_read/c/main.c b/level_3/fss_extended_list_read/c/main.c
index e9f1b605b9295b8e99de93a7ba45e5813482e38b..18e726a45c7f00d6bb8f2b031e6106e887be80f5 100644 (file)
--- a/level_3/fss_extended_list_read/c/main.c
+++ b/level_3/fss_extended_list_read/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_extended_list_read.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_extended_list_read_main_t main = fss_extended_list_read_main_t_initialize;
+  fss_extended_list_read_main_t data = fss_extended_list_read_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_extended_list_read_main(arguments, &main);
+  const f_status_t status = fss_extended_list_read_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_extended_list_write/c/main.c b/level_3/fss_extended_list_write/c/main.c
index 435f88a2dcb8352c545edbebbdadea6d13f6396d..de2a36e2271b1e142d00c1bf1e4ec3efdcc32727 100644 (file)
--- a/level_3/fss_extended_list_write/c/main.c
+++ b/level_3/fss_extended_list_write/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_extended_list_write.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_extended_list_write_main_t main = fss_extended_list_write_main_t_initialize;
+  fss_extended_list_write_main_t data = fss_extended_list_write_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_extended_list_write_main(arguments, &main);
+  const f_status_t status = fss_extended_list_write_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_extended_read/c/main.c b/level_3/fss_extended_read/c/main.c
index dbef7867d13de775d86cf0903dbc0a7a768551e2..aae3a3aa93dd12fca78a97ecfd8589cc6a6e7a49 100644 (file)
--- a/level_3/fss_extended_read/c/main.c
+++ b/level_3/fss_extended_read/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_extended_read.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_extended_read_main_t main = fss_extended_read_main_t_initialize;
+  fss_extended_read_main_t data = fss_extended_read_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_extended_read_main(arguments, &main);
+  const f_status_t status = fss_extended_read_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_extended_write/c/main.c b/level_3/fss_extended_write/c/main.c
index bfbeb9a6c6c12371811487f45e201a5ab23daf5c..1756734b145c17144d22320cc8fc26bb641a6429 100644 (file)
--- a/level_3/fss_extended_write/c/main.c
+++ b/level_3/fss_extended_write/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_extended_write.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_extended_write_main_t main = fss_extended_write_main_t_initialize;
+  fss_extended_write_main_t data = fss_extended_write_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_extended_write_main(arguments, &main);
+  const f_status_t status = fss_extended_write_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/fss_status_code/c/main.c b/level_3/fss_status_code/c/main.c
index 760d7e6a776bebd08f04cc48406a3f4d1920b434..5dfa15345840afc9a6cc71b4c18dcc93646ce1cf 100644 (file)
--- a/level_3/fss_status_code/c/main.c
+++ b/level_3/fss_status_code/c/main.c
@@ -1,14 +1,15 @@
 #include "fss_status_code.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  fss_status_code_main_t main = fss_status_code_main_t_initialize;
+  fss_status_code_main_t data = fss_status_code_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = fss_status_code_main(arguments, &main);
+  const f_status_t status = fss_status_code_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/iki_read/c/main.c b/level_3/iki_read/c/main.c
index bd2fa8204d15d36f3745650a7f33f1bfb33b6cfa..72105f4889f225003052ae1b9a464d5387b5b21d 100644 (file)
--- a/level_3/iki_read/c/main.c
+++ b/level_3/iki_read/c/main.c
@@ -1,14 +1,15 @@
 #include "iki_read.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  iki_read_main_t main = iki_read_main_t_initialize;
+  iki_read_main_t data = iki_read_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = iki_read_main(arguments, &main);
+  const f_status_t status = iki_read_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/iki_write/c/main.c b/level_3/iki_write/c/main.c
index 7fa07c5ef143f39e8c28ee1c5013027aecc5ffac..f2de7d4250c2287995916d891b0f7fa2d64330a2 100644 (file)
--- a/level_3/iki_write/c/main.c
+++ b/level_3/iki_write/c/main.c
@@ -1,14 +1,15 @@
 #include "iki_write.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  iki_write_main_t main = iki_write_main_t_initialize;
+  iki_write_main_t data = iki_write_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = iki_write_main(arguments, &main);
+  const f_status_t status = iki_write_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);

diff --git a/level_3/status_code/c/main.c b/level_3/status_code/c/main.c
index 7ece9e02bedb57f22d8e03b602f490d156e11873..7727663aeb3cd3089928756f0efeefb85a85364c 100644 (file)
--- a/level_3/status_code/c/main.c
+++ b/level_3/status_code/c/main.c
@@ -1,14 +1,15 @@
 #include "status_code.h"
 
 int main(const int argc, const f_string_t *argv) {
+
   const f_console_arguments_t arguments = { argc, argv };
-  status_code_main_t main = status_code_main_t_initialize;
+  status_code_main_t data = status_code_main_t_initialize;
 
   if (f_pipe_input_exists()) {
-    main.process_pipe = F_true;
+    data.process_pipe = F_true;
   }
 
-  const f_status_t status = status_code_main(arguments, &main);
+  const f_status_t status = status_code_main(arguments, &data);
 
   // flush output pipes before closing.
   fflush(f_type_output);