include guards: don't begin them with underscores

see: https://www.securecoding.cert.org/confluence/display/c/DCL37-C.+Do+not+declare+or+define+a+reserved+identifier

diff --git a/include/c128time.h b/include/c128time.h
index a53d2688d52dec8c9a875e54703cb596f2be96dd..c59528030579bcbe4688c96fad956691e2e24fc3 100644 (file)
--- a/include/c128time.h
+++ b/include/c128time.h
@@ -1,5 +1,5 @@
-#ifndef TIME_H_
-#define TIME_H_
+#ifndef TIME_H
+#define TIME_H
 void set_time(BYTE hrs, BYTE min, BYTE sec);
 char *get_time(void);
 #endif

diff --git a/include/config.h b/include/config.h
index 5a19e804afe7020931f0bb75979a74b242505b76..4dd7fcc9f71f0bfe93cb6e41121060352503611f 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -1,7 +1,7 @@
 #include "general.h"
 
-#ifndef CONFIG_H_
-#define CONFIG_H_
+#ifndef CONFIG_H
+#define CONFIG_H
 
 #define MAX_ITEMS 32
 #define MAX_ITEM_NAME_LENGTH 9
@@ -41,7 +41,7 @@ struct credits_array_t {
   struct credits_t credits[MAX_CREDIT_ITEMS];
 };
 
-#ifndef _IS_CONFIG_C
+#ifndef IS_CONFIG_C
 extern struct status_array_t status;
 extern struct credits_array_t credits;
 #endif
@@ -54,4 +54,4 @@ void load_credits(void);
 
 void save_items(void);
 void save_credits(void);
-#endif /*CONFIG_H_*/
+#endif /* CONFIG_H */

diff --git a/include/credit_manager.h b/include/credit_manager.h
index dba26c777870bc02bec16040c046f854f10063e3..79a4a57047d5409893a8de82f95e318eeaa0d368 100644 (file)
--- a/include/credit_manager.h
+++ b/include/credit_manager.h
@@ -1,6 +1,8 @@
-#ifndef CREDIT_MANAGER_H_
-#define CREDIT_MANAGER_H_
+#ifndef CREDIT_MANAGER_H
+#define CREDIT_MANAGER_H
+
 struct credits_t *find_credit(char *name);
 void deposit_credit(char *input);
 void credit_manager(void);
-#endif
+
+#endif /* CREDIT_MANAGER_H */

diff --git a/include/general.h b/include/general.h
index 0cd284405cdb17db09038445ff1be943d65e4319..df02244841ac1a03c13c3c0ab11296295c2403df 100644 (file)
--- a/include/general.h
+++ b/include/general.h
@@ -1,5 +1,5 @@
-#ifndef GENERAL_H_
-#define GENERAL_H_
+#ifndef GENERAL_H
+#define GENERAL_H
 
 #include <peekpoke.h>
 #include <stdint.h>
@@ -78,4 +78,4 @@ extern BYTE _oserror;
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #define min(a, b) ((a) > (b) ? (b) : (a))
 
-#endif /*GENERAL_H_*/
+#endif /* GENERAL_H */

diff --git a/include/globals.h b/include/globals.h
index 00fca09576a72a310f6820f1f28af838a7688412..8a64063260cc34aa9d7462a7f72f897c7883c319 100644 (file)
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,9 +1,9 @@
-#ifndef _GLOBALS_H_
-#define _GLOBALS_H_
+#ifndef GLOBALS_H
+#define GLOBALS_H
 
 #include <stdint.h>
 
-#ifdef _IS_GLOBALS_C
+#ifdef IS_GLOBALS_C
 #define GLOBAL
 #else
 #define GLOBAL extern
@@ -13,4 +13,4 @@ void init_globals(void);
 
 GLOBAL uint8_t printing;
 
-#endif // _GLOBALS_H_
+#endif /*  GLOBALS_H */

diff --git a/include/kasse.h b/include/kasse.h
index 43a67dacea3e372a3fd4fc23299c081517ad2279..aac65da91fb2ac3d1493e271692d15fff1a799d7 100644 (file)
--- a/include/kasse.h
+++ b/include/kasse.h
@@ -1,5 +1,5 @@
-#ifndef _KASSE_H
-#define _KASSE_H
+#ifndef KASSE_H
+#define KASSE_H
 
 void print_the_buffer(void);
 

diff --git a/include/print.h b/include/print.h
index 78d65d0fbc7db9708d8a8d0dffe7841af7b0379e..990e4df3694904bacca19294b70a92728b029cd1 100644 (file)
--- a/include/print.h
+++ b/include/print.h
@@ -1,5 +1,5 @@
-#ifndef _PRINT_H
-#define _PRINT_H
+#ifndef PRINT_H
+#define PRINT_H
 
 void init_log(void);
 void print_the_buffer(void);
@@ -7,7 +7,7 @@ void print_header(void);
 void log_file(const char *s);
 void log_flush(void);
 
-#ifdef _IS_PRINT
+#ifdef IS_PRINT_C
 char print_buffer[80 + 2 + 1];
 unsigned char log_num = 0;
 #else

diff --git a/include/vdc_patch_charset.h b/include/vdc_patch_charset.h
index ff80c82ef3f6d83f7ece5f06337af561a094121c..8b26b4857ec511004a5eba142cfd07de26071bc7 100644 (file)
--- a/include/vdc_patch_charset.h
+++ b/include/vdc_patch_charset.h
@@ -1,5 +1,5 @@
-#ifndef __VDC_PATCH_CHARSET_H_
-#define __VDC_PATCH_CHARSET_H_
+#ifndef VDC_PATCH_CHARSET_H
+#define VDC_PATCH_CHARSET_H
 
 void vdc_patch_charset(void);
 
@@ -12,4 +12,4 @@ void vdc_patch_charset(void);
 #define uUML "\xA9"
 #define szLIG "\xBF"
 
-#endif // __VDC_PATCH_CHARSET_H_
+#endif /* VDC_PATCH_CHARSET_H */

diff --git a/include/vdc_util.h b/include/vdc_util.h
index 2c10ccd5f761161b00020966001d292ba9fb27aa..84c6e00021e55828f41cb73938331a92ea02b8f6 100644 (file)
--- a/include/vdc_util.h
+++ b/include/vdc_util.h
@@ -1,5 +1,5 @@
-#ifndef __VDC_UTIL_H_
-#define __VDC_UTIL_H_
+#ifndef VDC_UTIL_H
+#define VDC_UTIL_H
 
 extern void __fastcall__ vdc_load_thinfont(void);
 extern unsigned char __fastcall__ vdc_read_reg(unsigned char reg);
@@ -11,4 +11,4 @@ extern void __fastcall__ vdc_write_mem(unsigned dest, const void *src,
                                        unsigned n);
 extern void __fastcall__ vdc_load_thinfont(void);
 
-#endif // __VDC_UTIL_H_
+#endif /* VDC_UTIL_H */

diff --git a/src/config.c b/src/config.c
index 6f561248a473743c9fb0dfcdd237b8cb5a59f1c6..6d447a740e8e0385bbe24729fe24f6a35a4b001d 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -4,7 +4,7 @@
  * See LICENSE for license information
  *
  */
-#define _IS_CONFIG_C
+#define IS_CONFIG_C
 
 #include <stdlib.h>
 #include <conio.h>

diff --git a/src/globals.c b/src/globals.c
index b759fe0de20e741c01a0daa4b40ea595588a10e3..c1032e2cc551276c7c0054ab29a1e2d842c11d47 100644 (file)
--- a/src/globals.c
+++ b/src/globals.c
@@ -1,4 +1,4 @@
-#define _IS_GLOBALS_C
+#define IS_GLOBALS_C
 #include "globals.h"
 
 void init_globals(void) {

diff --git a/src/print.c b/src/print.c
index dee15994efe06e20309865f0154e96df3ddb49b2..a0e63df655aed53ab9b2d2be68a6ec2fcefb0108 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -10,7 +10,7 @@
 #include <cbm.h>
 
 #include "general.h"
-#define _IS_PRINT
+#define IS_PRINT_C
 #include "print.h"
 #include "globals.h"