Cleanup: Improve header file define wrappers.

The ifdef wrappers used for each header file is updated to be more accurate in regards to the directory and file path structure.

diff --git a/sources/c/program/controller/controller/controller.h b/sources/c/program/controller/controller/controller.h
index 68396e4..ec54631 100644 (file)
--- a/sources/c/program/controller/controller/controller.h
+++ b/sources/c/program/controller/controller/controller.h
@@ -7,8 +7,8 @@
  *
  * This program provides the base include for the controller program.
  */
-#ifndef _controller_controller_h
-#define _controller_controller_h
+#ifndef _controller_controller_controller_h
+#define _controller_controller_controller_h
 
 // Controller includes.
 #include <program/controller/main/controller.h>
@@ -22,4 +22,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_controller_h
+#endif // _controller_controller_controller_h

diff --git a/sources/c/program/controller/controller/main.h b/sources/c/program/controller/controller/main.h
index 378ada6..276a72b 100644 (file)
--- a/sources/c/program/controller/controller/main.h
+++ b/sources/c/program/controller/controller/main.h
@@ -8,8 +8,8 @@
  * This file is only ever included by program/controller/controller/main.c and should not normally be included anywhere else.
  * Anything that wants to include this should be providing the "controller" program functionality in some manner.
  */
-#ifndef _controller_controller_h
-#define _controller_controller_h
+#ifndef _controller_controller_main_h
+#define _controller_controller_main_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -35,4 +35,4 @@ extern int main(const int argc, const f_string_t *argv, const f_string_t *envp);
 } // extern "C"
 #endif
 
-#endif // _controller_controller_h
+#endif // _controller_controller_main_h

diff --git a/sources/c/program/controller/init/init.h b/sources/c/program/controller/init/init.h
index 1fe958c..52bf80d 100644 (file)
--- a/sources/c/program/controller/init/init.h
+++ b/sources/c/program/controller/init/init.h
@@ -7,8 +7,8 @@
  *
  * This program provides the base include for the init program.
  */
-#ifndef _controller_init_h
-#define _controller_init_h
+#ifndef _controller_init_init_h
+#define _controller_init_init_h
 
 // Controller includes.
 #include <program/controller/main/controller.h>
@@ -46,4 +46,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_init_h
+#endif // _controller_init_init_h

diff --git a/sources/c/program/controller/main/controller.h b/sources/c/program/controller/main/controller.h
index 4023b00..d020314 100644 (file)
--- a/sources/c/program/controller/main/controller.h
+++ b/sources/c/program/controller/main/controller.h
@@ -9,8 +9,8 @@
  *
  * This program does nothing but can be used as a starting point for new program projects.
  */
-#ifndef _controller_h
-#define _controller_h
+#ifndef _controller_main_h
+#define _controller_main_h
 
 // Include pre-requirements.
 #ifndef _GNU_SOURCE
@@ -180,4 +180,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_h
+#endif // _controller_main_h

diff --git a/sources/c/program/controller/main/convert.h b/sources/c/program/controller/main/convert.h
index 6f7e6bb..328654a 100644 (file)
--- a/sources/c/program/controller/main/convert.h
+++ b/sources/c/program/controller/main/convert.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_convert_h
-#define _controller_convert_h
+#ifndef _controller_main_convert_h
+#define _controller_main_convert_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -130,4 +130,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_convert_h
+#endif // _controller_main_convert_h

diff --git a/sources/c/program/controller/main/entry.h b/sources/c/program/controller/main/entry.h
index dc37985..fa98429 100644 (file)
--- a/sources/c/program/controller/main/entry.h
+++ b/sources/c/program/controller/main/entry.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_entry_h
-#define _controller_entry_h
+#ifndef _controller_main_entry_h
+#define _controller_main_entry_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,4 +71,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_entry_h
+#endif // _controller_main_entry_h

diff --git a/sources/c/program/controller/main/file.h b/sources/c/program/controller/main/file.h
index ceab24b..e94a03b 100644 (file)
--- a/sources/c/program/controller/main/file.h
+++ b/sources/c/program/controller/main/file.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_file_h
-#define _controller_file_h
+#ifndef _controller_main_file_h
+#define _controller_main_file_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -130,4 +130,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_file_h
+#endif // _controller_main_file_h

diff --git a/sources/c/program/controller/main/instance.h b/sources/c/program/controller/main/instance.h
index 663c93d..44a5acb 100644 (file)
--- a/sources/c/program/controller/main/instance.h
+++ b/sources/c/program/controller/main/instance.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_instance_h
-#define _controller_instance_h
+#ifndef _controller_main_instance_h
+#define _controller_main_instance_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -45,4 +45,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_instance_h
+#endif // _controller_main_instance_h

diff --git a/sources/c/program/controller/main/lock.h b/sources/c/program/controller/main/lock.h
index a011543..d06067e 100644 (file)
--- a/sources/c/program/controller/main/lock.h
+++ b/sources/c/program/controller/main/lock.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_lock_h
-#define _controller_lock_h
+#ifndef _controller_main_lock_h
+#define _controller_main_lock_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -169,4 +169,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_lock_h
+#endif // _controller_main_lock_h

diff --git a/sources/c/program/controller/main/path.h b/sources/c/program/controller/main/path.h
index 6a83e9f..56b18da 100644 (file)
--- a/sources/c/program/controller/main/path.h
+++ b/sources/c/program/controller/main/path.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_path_h
-#define _controller_path_h
+#ifndef _controller_main_path_h
+#define _controller_main_path_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -62,4 +62,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_path_h
+#endif // _controller_main_path_h

diff --git a/sources/c/program/controller/main/perform.h b/sources/c/program/controller/main/perform.h
index b62af37..65397e4 100644 (file)
--- a/sources/c/program/controller/main/perform.h
+++ b/sources/c/program/controller/main/perform.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_perform_h
-#define _controller_perform_h
+#ifndef _controller_main_perform_h
+#define _controller_main_perform_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -80,4 +80,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_perform_h
+#endif // _controller_main_perform_h

diff --git a/sources/c/program/controller/main/process.h b/sources/c/program/controller/main/process.h
index 2e4abd3..9d974f2 100644 (file)
--- a/sources/c/program/controller/main/process.h
+++ b/sources/c/program/controller/main/process.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_process_h
-#define _controller_process_h
+#ifndef _controller_main_process_h
+#define _controller_main_process_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,4 +48,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_process_h
+#endif // _controller_main_process_h

diff --git a/sources/c/program/controller/main/signal.h b/sources/c/program/controller/main/signal.h
index 4b0577e..5ee1b6e 100644 (file)
--- a/sources/c/program/controller/main/signal.h
+++ b/sources/c/program/controller/main/signal.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_signal_h
-#define _controller_signal_h
+#ifndef _controller_main_signal_h
+#define _controller_main_signal_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -83,4 +83,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_signal_h
+#endif // _controller_main_signal_h

diff --git a/sources/c/program/controller/main/status.h b/sources/c/program/controller/main/status.h
index 7c84784..e2b9c34 100644 (file)
--- a/sources/c/program/controller/main/status.h
+++ b/sources/c/program/controller/main/status.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_status_h
-#define _controller_status_h
+#ifndef _controller_main_status_h
+#define _controller_main_status_h
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,4 +33,4 @@ extern "C" {
 } // extern "C"
 #endif
 
-#endif // _controller_status_h
+#endif // _controller_main_status_h

diff --git a/sources/c/program/controller/main/time.h b/sources/c/program/controller/main/time.h
index 67b9623..3e4678c 100644 (file)
--- a/sources/c/program/controller/main/time.h
+++ b/sources/c/program/controller/main/time.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_time_h
-#define _controller_time_h
+#ifndef _controller_main_time_h
+#define _controller_main_time_h
 
 /**
  * Get the current time, plus the given offset.
@@ -59,4 +59,4 @@
 } // extern "C"
 #endif
 
-#endif // _controller_time_h
+#endif // _controller_main_time_h

diff --git a/sources/c/program/controller/main/validate.h b/sources/c/program/controller/main/validate.h
index bd751b0..8035b75 100644 (file)
--- a/sources/c/program/controller/main/validate.h
+++ b/sources/c/program/controller/main/validate.h
@@ -9,8 +9,8 @@
  *
  * This is auto-included and should not need to be explicitly included.
  */
-#ifndef _controller_validate_h
-#define _controller_validate_h
+#ifndef _controller_main_validate_h
+#define _controller_main_validate_h
 
 /**
  * Validate that the given string is a valid environment variable name.
@@ -60,4 +60,4 @@
 } // extern "C"
 #endif
 
-#endif // _controller_validate_h
+#endif // _controller_main_validate_h