From e572e78b76a53cbfd24946e2a0d7f1320b5a9875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Sch=C3=B6bel?= <jonathan@xn--schbel-yxa.info> Date: Mon, 9 Jan 2023 10:47:24 +0100 Subject: [PATCH] renamed macros --- sefht.geany | 30 +++++++++++++++--------------- src/lib/Makefile.am | 2 +- src/lib/sefht/cms.h | 2 +- src/lib/sefht/data.h | 2 +- src/lib/sefht/fragment.h | 2 +- src/lib/sefht/fragment_class.c | 6 +++--- src/lib/sefht/fragment_data.c | 6 +++--- src/lib/sefht/log.h | 2 +- src/lib/sefht/macro.h | 2 +- src/lib/sefht/node_fragment.h | 2 +- src/lib/sefht/sefht.h | 4 ++-- src/lib/sefht/status.h | 6 +++--- src/lib/sefht/text.h | 2 +- src/lib/sefht/validator.h | 2 +- tests/Makefile.am | 2 +- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/sefht.geany b/sefht.geany index 387a93e..4f9cbf8 100644 --- a/sefht.geany +++ b/sefht.geany @@ -28,32 +28,32 @@ long_line_behaviour=1 long_line_column=72 [files] -current_page=19 +current_page=21 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_3=1260;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=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_5=901;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=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_7=904;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=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_9=916;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=1975;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=2173;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=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_13=931;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=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_15=904;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=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_17=919;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=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=4600;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_20=4608;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=901;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=907;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=1078;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=290;Make;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2FMakefile.am;0;8 FILE_NAME_25=1085;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_cms.c;0;8 FILE_NAME_26=3283;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_data.c;0;8 FILE_NAME_27=13617;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Ftests%2Ftest_node_fragment.c;0;8 diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 9ce2c17..38a43da 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -34,5 +34,5 @@ nobase_include_HEADERS += sefht/text.h nobase_include_HEADERS += sefht/validator.h nobase_include_HEADERS += sefht/validator_tag.h -libsefht_la_CPPFLAGS = -DLIB_SEFHT_COMPILATION +libsefht_la_CPPFLAGS = -DSEFHT_COMPILATION libsefht_la_LDFLAGS = -version_info 0:0:0 diff --git a/src/lib/sefht/cms.h b/src/lib/sefht/cms.h index aa00772..73030b1 100644 --- a/src/lib/sefht/cms.h +++ b/src/lib/sefht/cms.h @@ -25,7 +25,7 @@ #ifndef SEFHT_CMS_H #define SEFHT_CMS_H -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif diff --git a/src/lib/sefht/data.h b/src/lib/sefht/data.h index 35612e6..8aa817b 100644 --- a/src/lib/sefht/data.h +++ b/src/lib/sefht/data.h @@ -25,7 +25,7 @@ #ifndef SEFHT_DATA_H #define SEFHT_DATA_H -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif diff --git a/src/lib/sefht/fragment.h b/src/lib/sefht/fragment.h index b1cb6cf..f2602e8 100644 --- a/src/lib/sefht/fragment.h +++ b/src/lib/sefht/fragment.h @@ -25,7 +25,7 @@ #ifndef SEFHT_FRAGMENT_H #define SEFHT_FRAGMENT_H -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif diff --git a/src/lib/sefht/fragment_class.c b/src/lib/sefht/fragment_class.c index 55c98ea..3a478d1 100644 --- a/src/lib/sefht/fragment_class.c +++ b/src/lib/sefht/fragment_class.c @@ -25,7 +25,7 @@ #ifndef SEFHT_FRAGMENT_CLASS_C #define SEFHT_FRAGMENT_CLASS_C -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif @@ -35,7 +35,7 @@ #include "text.h" -#ifdef LIB_SEFHT_COMPILATION +#ifdef SEFHT_COMPILATION #include "fragment_data.c" static inline @@ -89,5 +89,5 @@ get_type (const struct SH_Fragment * fragment) return fragment->type; } -#endif /* LIB_SEFHT_COMPILATION */ +#endif /* SEFHT_COMPILATION */ #endif /* SEFHT_FRAGMENT_CLASS_C */ diff --git a/src/lib/sefht/fragment_data.c b/src/lib/sefht/fragment_data.c index 5cbc21a..f55a71c 100644 --- a/src/lib/sefht/fragment_data.c +++ b/src/lib/sefht/fragment_data.c @@ -25,7 +25,7 @@ #ifndef SEFHT_FRAGMENT_DATA_C #define SEFHT_FRAGMENT_DATA_C -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif @@ -35,7 +35,7 @@ #include "text.h" -#ifdef LIB_SEFHT_COMPILATION +#ifdef SEFHT_COMPILATION enum SH_FRAGMENT_TYPE { @@ -82,5 +82,5 @@ struct SH_Fragment /*@shared@*/ const struct fragment_methods * methods; }; -#endif /* LIB_SEFHT_COMPILATION */ +#endif /* SEFHT_COMPILATION */ #endif /* SEFHT_FRAGMENT_DATA_C */ diff --git a/src/lib/sefht/log.h b/src/lib/sefht/log.h index 2721856..2f81d23 100644 --- a/src/lib/sefht/log.h +++ b/src/lib/sefht/log.h @@ -25,7 +25,7 @@ #ifndef SEFHT_LOG_H #define SEFHT_LOG_H -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif diff --git a/src/lib/sefht/macro.h b/src/lib/sefht/macro.h index 418706d..71286e6 100644 --- a/src/lib/sefht/macro.h +++ b/src/lib/sefht/macro.h @@ -25,7 +25,7 @@ #ifndef SEFHT_MACRO_H #define SEFHT_MACRO_H -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif diff --git a/src/lib/sefht/node_fragment.h b/src/lib/sefht/node_fragment.h index 6581817..46be532 100644 --- a/src/lib/sefht/node_fragment.h +++ b/src/lib/sefht/node_fragment.h @@ -25,7 +25,7 @@ #ifndef SEFHT_NODE_FRAGMENT_H #define SEFHT_NODE_FRAGMENT_H -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #status "Only <sefht/sefht.h> can be included directly." #endif diff --git a/src/lib/sefht/sefht.h b/src/lib/sefht/sefht.h index 20e68ff..b94c267 100644 --- a/src/lib/sefht/sefht.h +++ b/src/lib/sefht/sefht.h @@ -25,7 +25,7 @@ #ifndef SEFHT_SEFHT_H #define SEFHT_SEFHT_H -#define __SEFHT_H_INSIDE__ +#define SEFHT_SEFHT_H_INSIDE #include "log.h" #include "macro.h" @@ -38,6 +38,6 @@ #include "text.h" #include "validator.h" -#undef __SEFHT_H_INSIDE__ +#undef SEFHT_SEFHT_H_INSIDE #endif /* SEFHT_SEFHT_H */ diff --git a/src/lib/sefht/status.h b/src/lib/sefht/status.h index 00d8289..4b4b479 100644 --- a/src/lib/sefht/status.h +++ b/src/lib/sefht/status.h @@ -30,12 +30,12 @@ #include "macro.h" -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif -#ifdef LIB_SEFHT_COMPILATION +#ifdef SEFHT_COMPILATION #define succeed(STATUS) \ (((STATUS) != NULL) && ((STATUS)->status == SUCCESS)) @@ -101,7 +101,7 @@ do { \ } \ while (FALSE) -#endif /* LIB_SEFHT_COMPILATION */ +#endif /* SEFHT_COMPILATION */ struct SH_Status diff --git a/src/lib/sefht/text.h b/src/lib/sefht/text.h index 9a8d916..b4bfa96 100644 --- a/src/lib/sefht/text.h +++ b/src/lib/sefht/text.h @@ -25,7 +25,7 @@ #ifndef SEFHT_TEXT_H #define SEFHT_TEXT_H -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif diff --git a/src/lib/sefht/validator.h b/src/lib/sefht/validator.h index 71c3fda..55de52a 100644 --- a/src/lib/sefht/validator.h +++ b/src/lib/sefht/validator.h @@ -25,7 +25,7 @@ #ifndef SEFHT_VALIDATOR_H #define SEFHT_VALIDATOR_H -#if !defined (__SEFHT_H_INSIDE__) && !defined (LIB_SEFHT_COMPILATION) +#if !defined (SEFHT_SEFHT_H_INSIDE) && !defined (SEFHT_COMPILATION) #error "Only <sefht/sefht.h> can be included directly." #endif diff --git a/tests/Makefile.am b/tests/Makefile.am index e75da67..3053a22 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,7 +11,7 @@ TESTS += sefht_text_test check_PROGRAMS = $(TESTS) AM_CPPFLAGS = -AM_CPPFLAGS += -DLIB_SEFHT_COMPILATION +AM_CPPFLAGS += -DSEFHT_COMPILATION AM_CPPFLAGS += -I$(top_srcdir)/src/lib/sefht LDADD = $(CHECK_LIBS) -- GitLab