From ee5756ca353da71ad6371f006e996bf1c048f227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Sch=C3=B6bel?= <jonathan@xn--schbel-yxa.info> Date: Fri, 6 Jan 2023 17:05:07 +0100 Subject: [PATCH] renamed header macro guardes (double inclusion) Symbols preceded by an underscore are reserved for future introductions by the c standard/library. --- sefht.geany | 28 ++++++++++++++-------------- src/lib/sefht/cms.h | 6 +++--- src/lib/sefht/data.h | 6 +++--- src/lib/sefht/fragment.h | 6 +++--- src/lib/sefht/fragment_class.c | 6 +++--- src/lib/sefht/fragment_data.c | 6 +++--- src/lib/sefht/log.h | 6 +++--- src/lib/sefht/macro.h | 6 +++--- src/lib/sefht/node_fragment.h | 6 +++--- src/lib/sefht/sefht.h | 6 +++--- src/lib/sefht/status.h | 6 +++--- src/lib/sefht/text.h | 6 +++--- src/lib/sefht/validator.h | 6 +++--- src/lib/sefht/validator_tag.h | 8 ++++---- 14 files changed, 54 insertions(+), 54 deletions(-) diff --git a/sefht.geany b/sefht.geany index ef3264e..9e86ec7 100644 --- a/sefht.geany +++ b/sefht.geany @@ -28,31 +28,31 @@ long_line_behaviour=1 long_line_column=72 [files] -current_page=19 +current_page=10 FILE_NAME_0=923;Sh;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fconfigure.ac;0;8 FILE_NAME_1=73;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2FMakefile.am;0;8 FILE_NAME_2=1143;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Fmain.c;0;8 FILE_NAME_3=640;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2FMakefile.am;0;8 FILE_NAME_4=1593;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.c;0;8 -FILE_NAME_5=1395;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.h;0;8 +FILE_NAME_5=839;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.h;0;8 FILE_NAME_6=2921;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.c;0;8 -FILE_NAME_7=1583;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.h;0;8 +FILE_NAME_7=841;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fdata.h;0;8 FILE_NAME_8=1185;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.c;0;8 -FILE_NAME_9=1835;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.h;0;8 -FILE_NAME_10=1923;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_data.c;0;8 -FILE_NAME_11=1701;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_class.c;0;8 +FILE_NAME_9=849;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.h;0;8 +FILE_NAME_10=859;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_data.c;0;8 +FILE_NAME_11=2220;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment_class.c;0;8 FILE_NAME_12=8225;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.c;0;8 -FILE_NAME_13=1892;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.h;0;8 +FILE_NAME_13=829;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fnode_fragment.h;0;8 FILE_NAME_14=25820;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.c;0;8 -FILE_NAME_15=3637;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.h;0;8 +FILE_NAME_15=841;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ftext.h;0;8 FILE_NAME_16=1779;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.c;0;8 -FILE_NAME_17=1688;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.h;0;8 +FILE_NAME_17=851;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.h;0;8 FILE_NAME_18=14237;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag.c;0;8 -FILE_NAME_19=1156;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag.h;0;8 -FILE_NAME_20=4304;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fstatus.h;0;8 -FILE_NAME_21=1017;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Flog.h;0;4 -FILE_NAME_22=1077;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fmacro.h;0;8 -FILE_NAME_23=937;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fsefht.h;0;8 +FILE_NAME_19=859;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator_tag.h;0;8 +FILE_NAME_20=852;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fstatus.h;0;8 +FILE_NAME_21=839;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Flog.h;0;4 +FILE_NAME_22=1070;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fmacro.h;0;8 +FILE_NAME_23=1106;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fsefht.h;0;8 FILE_NAME_24=499;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2FMakefile.am;0;8 FILE_NAME_25=1510;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_cms.c;0;8 FILE_NAME_26=3878;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_data.c;0;8 diff --git a/src/lib/sefht/cms.h b/src/lib/sefht/cms.h index 5aea677..aa00772 100644 --- a/src/lib/sefht/cms.h +++ b/src/lib/sefht/cms.h @@ -22,8 +22,8 @@ */ -#ifndef __CMS_H__ -#define __CMS_H__ +#ifndef SEFHT_CMS_H +#define SEFHT_CMS_H #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -58,4 +58,4 @@ SH_Cms_register_page (struct SH_Cms * cms, const char * name, /*@modifies fileSystem@*/ /*@modifies status@*/; -#endif /* __CMS_H__ */ +#endif /* SEFHT_CMS_H */ diff --git a/src/lib/sefht/data.h b/src/lib/sefht/data.h index 8cda0c5..35612e6 100644 --- a/src/lib/sefht/data.h +++ b/src/lib/sefht/data.h @@ -22,8 +22,8 @@ */ -#ifndef __DATA_H__ -#define __DATA_H__ +#ifndef SEFHT_DATA_H +#define SEFHT_DATA_H #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -65,4 +65,4 @@ SH_Data_register_page (SH_Data * data, const char * name, /*@modifies fileSystem@*/ /*@modifies status@*/; -#endif /* __DATA_H__ */ +#endif /* SEFHT_DATA_H */ diff --git a/src/lib/sefht/fragment.h b/src/lib/sefht/fragment.h index 357a097..b1cb6cf 100644 --- a/src/lib/sefht/fragment.h +++ b/src/lib/sefht/fragment.h @@ -22,8 +22,8 @@ */ -#ifndef __FRAGMENT_H__ -#define __FRAGMENT_H__ +#ifndef SEFHT_FRAGMENT_H +#define SEFHT_FRAGMENT_H #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -71,4 +71,4 @@ SH_Fragment_to_html (const struct SH_Fragment * fragment, /*@modifies fileSystem@*/ /*@modifies status@*/; -#endif /* __FRAGMENT_H__ */ +#endif /* SEFHT_FRAGMENT_H */ diff --git a/src/lib/sefht/fragment_class.c b/src/lib/sefht/fragment_class.c index c33cfdb..55c98ea 100644 --- a/src/lib/sefht/fragment_class.c +++ b/src/lib/sefht/fragment_class.c @@ -22,8 +22,8 @@ */ -#ifndef __FRAGMENT_CLASS_C__ -#define __FRAGMENT_CLASS_C__ +#ifndef SEFHT_FRAGMENT_CLASS_C +#define SEFHT_FRAGMENT_CLASS_C #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -90,4 +90,4 @@ get_type (const struct SH_Fragment * fragment) } #endif /* LIB_SEFHT_COMPILATION */ -#endif /* __FRAGMENT_CLASS_C__ */ +#endif /* SEFHT_FRAGMENT_CLASS_C */ diff --git a/src/lib/sefht/fragment_data.c b/src/lib/sefht/fragment_data.c index 334a3ba..5cbc21a 100644 --- a/src/lib/sefht/fragment_data.c +++ b/src/lib/sefht/fragment_data.c @@ -22,8 +22,8 @@ */ -#ifndef __FRAGMENT_DATA_C__ -#define __FRAGMENT_DATA_C__ +#ifndef SEFHT_FRAGMENT_DATA_C +#define SEFHT_FRAGMENT_DATA_C #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -83,4 +83,4 @@ struct SH_Fragment }; #endif /* LIB_SEFHT_COMPILATION */ -#endif /* __FRAGMENT_DATA_C__ */ +#endif /* SEFHT_FRAGMENT_DATA_C */ diff --git a/src/lib/sefht/log.h b/src/lib/sefht/log.h index 5b9e4ca..2721856 100644 --- a/src/lib/sefht/log.h +++ b/src/lib/sefht/log.h @@ -22,8 +22,8 @@ */ -#ifndef __LOG_H__ -#define __LOG_H__ +#ifndef SEFHT_LOG_H +#define SEFHT_LOG_H #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -35,4 +35,4 @@ #define ERROR1(message) printf (message) #define ERROR_(message, ...) printf (message, __VA_ARGS__) -#endif /* __LOG_H__ */ +#endif /* SEFHT_LOG_H */ diff --git a/src/lib/sefht/macro.h b/src/lib/sefht/macro.h index 23dd36a..418706d 100644 --- a/src/lib/sefht/macro.h +++ b/src/lib/sefht/macro.h @@ -22,8 +22,8 @@ */ -#ifndef __MACRO_H__ -#define __MACRO_H__ +#ifndef SEFHT_MACRO_H +#define SEFHT_MACRO_H #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -34,4 +34,4 @@ #define TRUE (bool) 1 #define FALSE (bool) 0 -#endif /* __MACRO_H__ */ +#endif /* SEFHT_MACRO_H */ diff --git a/src/lib/sefht/node_fragment.h b/src/lib/sefht/node_fragment.h index 518c52d..6581817 100644 --- a/src/lib/sefht/node_fragment.h +++ b/src/lib/sefht/node_fragment.h @@ -22,8 +22,8 @@ */ -#ifndef __NODE_FRAGMENT_H__ -#define __NODE_FRAGMENT_H__ +#ifndef SEFHT_NODE_FRAGMENT_H +#define SEFHT_NODE_FRAGMENT_H #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #status "Only <sefht/sefht.h> can be included directly." @@ -133,4 +133,4 @@ SH_NodeFragment_to_html (const SH_NodeFragment * fragment, /*@modifies fileSystem@*/ /*@modifies status@*/; -#endif /* __NODE_FRAGMENT_H__ */ +#endif /* SEFHT_NODE_FRAGMENT_H */ diff --git a/src/lib/sefht/sefht.h b/src/lib/sefht/sefht.h index c482590..20e68ff 100644 --- a/src/lib/sefht/sefht.h +++ b/src/lib/sefht/sefht.h @@ -22,8 +22,8 @@ */ -#ifndef __SEFHT_H__ -#define __SEFHT_H__ +#ifndef SEFHT_SEFHT_H +#define SEFHT_SEFHT_H #define __SEFHT_H_INSIDE__ @@ -40,4 +40,4 @@ #undef __SEFHT_H_INSIDE__ -#endif /* __SEFHT_H__ */ +#endif /* SEFHT_SEFHT_H */ diff --git a/src/lib/sefht/status.h b/src/lib/sefht/status.h index 0cc1dcb..8debe4c 100644 --- a/src/lib/sefht/status.h +++ b/src/lib/sefht/status.h @@ -22,8 +22,8 @@ */ -#ifndef __STATUS_H__ -#define __STATUS_H__ +#ifndef SEFHT_STATUS_H +#define SEFHT_STATUS_H #include <errno.h> #include <string.h> @@ -115,4 +115,4 @@ struct SH_Status /*@observer@*/ /*@null@*/ char * message; }; -#endif /* __STATUS_H__ */ +#endif /* SEFHT_STATUS_H */ diff --git a/src/lib/sefht/text.h b/src/lib/sefht/text.h index 7b90514..9a8d916 100644 --- a/src/lib/sefht/text.h +++ b/src/lib/sefht/text.h @@ -22,8 +22,8 @@ */ -#ifndef __TEXT_H__ -#define __TEXT_H__ +#ifndef SEFHT_TEXT_H +#define SEFHT_TEXT_H #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -138,4 +138,4 @@ SH_Text_print (const SH_Text * text) /*@globals fileSystem@*/ /*@modifies fileSystem@*/; -#endif /* __TEXT_H__ */ +#endif /* SEFHT_TEXT_H */ diff --git a/src/lib/sefht/validator.h b/src/lib/sefht/validator.h index 9b4b44c..71c3fda 100644 --- a/src/lib/sefht/validator.h +++ b/src/lib/sefht/validator.h @@ -22,8 +22,8 @@ */ -#ifndef __VALIDATOR_H__ -#define __VALIDATOR_H__ +#ifndef SEFHT_VALIDATOR_H +#define SEFHT_VALIDATOR_H #if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." @@ -62,4 +62,4 @@ SH_Validator_free (/*@only@*/ struct SH_Validator * validator) /*@releases validator@*/; -#endif /* __VALIDATOR_H__ */ +#endif /* SEFHT_VALIDATOR_H */ diff --git a/src/lib/sefht/validator_tag.h b/src/lib/sefht/validator_tag.h index bc8305d..185ff88 100644 --- a/src/lib/sefht/validator_tag.h +++ b/src/lib/sefht/validator_tag.h @@ -22,10 +22,10 @@ */ -#ifndef __VALIDATOR_TAG_H__ -#define __VALIDATOR_TAG_H__ +#ifndef SEFHT_VALIDATOR_TAG_H +#define SEFHT_VALIDATOR_TAG_H -#if !defined (__VALIDATOR_H__) +#if !defined (SEFHT_VALIDATOR_H) #error "Please include only <sefht/validator.h>." #endif @@ -67,4 +67,4 @@ SH_Validator_check_tag (struct SH_Validator * validator, const char * tag) /*@*/; -#endif /* __VALIDATOR_TAG_H__ */ +#endif /* SEFHT_VALIDATOR_TAG_H */ -- GitLab