diff --git a/sefht.geany b/sefht.geany
index ff5649cfd8acc5a9e48a880305efd6eaf5658157..39bd9158495e11cfb98f05ad454f391effabb24d 100644
--- a/sefht.geany
+++ b/sefht.geany
@@ -28,13 +28,13 @@ long_line_behaviour=1
long_line_column=72
[files]
-current_page=26
+current_page=4
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=944;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=1021;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fcms.h;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_6=4511;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=1145;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=1733;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Ffragment.c;0;8
@@ -47,7 +47,7 @@ FILE_NAME_14=1212;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fp
FILE_NAME_15=1260;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fvalidator.h;0;8
FILE_NAME_16=1466;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_17=1135;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_18=4232;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fstatus.h;0;8
+FILE_NAME_18=1361;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fstatus.h;0;8
FILE_NAME_19=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_20=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_21=937;C;0;EUTF-8;1;1;0;%2Fhome%2Fjonathan%2FDokumente%2Fprojekte%2Fprgm%2Finternet%2Fweb%2FSeFHT%2Fsrc%2Flib%2Fsefht%2Fsefht.h;0;8
diff --git a/src/lib/sefht/cms.c b/src/lib/sefht/cms.c
index 6923712b2f149658017a541aa8f070348c6b8005..b76720e6e3949b63198fa237fedb419924be0ecb 100644
--- a/src/lib/sefht/cms.c
+++ b/src/lib/sefht/cms.c
@@ -35,12 +35,17 @@
struct SH_Cms
{
- SH_Data * data;
+ /*@only@*/ SH_Data * data;
};
+/*@null@*/
+/*@only@*/
struct SH_Cms *
-SH_Cms_new (struct SH_Status * status)
+SH_Cms_new (/*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@globals fileSystem@*/
+ /*@modifies fileSystem@*/
+ /*@modifies status@*/
{
struct SH_Cms * cms;
cms = malloc (sizeof (struct SH_Cms));
@@ -58,17 +63,18 @@ SH_Cms_new (struct SH_Status * status)
if (cms->data == NULL)
{
free (cms);
-
return NULL;
}
set_success (status);
-
return cms;
}
void
-SH_Cms_free (struct SH_Cms * cms)
+SH_Cms_free (/*@only@*/ struct SH_Cms * cms)
+ /*@modifies cms->data@*/
+ /*@modifies cms@*/
+ /*@releases cms@*/
{
SH_Data_free (cms->data);
@@ -80,6 +86,10 @@ SH_Cms_free (struct SH_Cms * cms)
page_t
SH_Cms_register_page (struct SH_Cms * cms, const char * name,
struct SH_Status * status)
+ /*@modifies cms->data@*/
+ /*@globals fileSystem@*/
+ /*@modifies fileSystem@*/
+ /*@modifies status@*/
{
return SH_Data_register_page (cms->data, name, status);
}
diff --git a/src/lib/sefht/cms.h b/src/lib/sefht/cms.h
index 924a433c281245b012582c5788e5f721e6c70266..5aea677010e427a6fa7ac700a239e5ec21f3949d 100644
--- a/src/lib/sefht/cms.h
+++ b/src/lib/sefht/cms.h
@@ -34,17 +34,28 @@
#include "data.h"
-typedef struct SH_Cms SH_Cms;
+typedef /*@abstract@*/ struct SH_Cms SH_Cms;
+/*@null@*/
+/*@only@*/
SH_Cms *
-SH_Cms_new (struct SH_Status * status);
+SH_Cms_new (/*@null@*/ /*@out@*/ struct SH_Status * status)
+ /*@globals fileSystem@*/
+ /*@modifies fileSystem@*/
+ /*@modifies status@*/;
void
-SH_Cms_free (SH_Cms * cms);
+SH_Cms_free (/*@only@*/ SH_Cms * cms)
+ /*@modifies cms@*/
+ /*@releases cms@*/;
page_t
-SH_Cms_register_page (SH_Cms * cms, const char * name,
- struct SH_Status * status);
+SH_Cms_register_page (struct SH_Cms * cms, const char * name,
+ struct SH_Status * status)
+ /*@modifies cms@*/
+ /*@globals fileSystem@*/
+ /*@modifies fileSystem@*/
+ /*@modifies status@*/;
#endif /* __CMS_H__ */
diff --git a/src/lib/sefht/status.h b/src/lib/sefht/status.h
index 3c50f420f4a1544b907586d947e24af5d191f278..3d7266dc59871bc8ca89a9bfd78c8fbfe0a643d2 100644
--- a/src/lib/sefht/status.h
+++ b/src/lib/sefht/status.h
@@ -44,8 +44,6 @@
#define unknown(STATUS) (STATUS == NULL)
-/* ignore macros to silence splint */
-#ifndef S_SPLINT_S
#define set_status(STATUS, ERROR, OFFSET, MESSAGE) \
do \
{ \
@@ -92,14 +90,6 @@ while (0)
#define set_success(STATUS) set_status(STATUS, SUCCESS, 0, NULL)
-#else /* S_SPLINT_S */
-/* stupid alternatives to silence splint */
-#define set_status(STATUS, ERROR, OFFSET, MESSAGE) STATUS++;
-#define set_status_(STATUS, ERROR, OFFSET, MESSAGE) STATUS++;
-#define set_success(STATUS) STATUS++;
-
-#endif /* S_SPLINT_S */
-
#endif /* LIB_SEFHT_COMPILATION */