vCard: reorganize #includes

cyrusimap · Jan 4, 2024 · e6ce46a · e6ce46a
1 parent b15159f
commit e6ce46a
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 39 deletions.
diff --git a/src/libicalvcard/vcardcomponent.c b/src/libicalvcard/vcardcomponent.c
@@ -7,12 +7,12 @@
 #include <config.h>
 #endif
 
-#include "icalerror.h"
-#include "icalmemory.h"
 #include "vcardcomponent.h"
 #include "vcardparser.h"
 #include "vcardproperty_p.h"
 #include "vcardrestriction.h"
+#include "icalerror.h"
+#include "icalmemory.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/src/libicalvcard/vcardderivedproperty.h.in b/src/libicalvcard/vcardderivedproperty.h.in
@@ -6,8 +6,8 @@
 #ifndef VCARDDERIVEDPROPERTY_H
 #define VCARDDERIVEDPROPERTY_H
 
-#include "vcardparameter.h"
 #include "vcardderivedvalue.h"
+#include "vcardparameter.h"
 
 typedef struct vcardproperty_impl vcardproperty;
 

diff --git a/src/libicalvcard/vcardderivedvalue.h.in b/src/libicalvcard/vcardderivedvalue.h.in
@@ -7,7 +7,6 @@
 #define VCARDDERIVEDVALUE_H
 
 #include "libical_vcard_export.h"
-
 #include "vcardstrarray.h"
 #include "vcardstructured.h"
 #include "vcardtime.h"

diff --git a/src/libicalvcard/vcardenumarray.c b/src/libicalvcard/vcardenumarray.c
@@ -1,7 +1,11 @@
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include "icalmemory.h"
 #include "vcardenumarray.h"
+#include "icalmemory.h"
+
+#include <string.h>
 
 ssize_t vcardenumarray_find(vcardenumarray *array,
                             vcardenumarray_element *needle)

diff --git a/src/libicalvcard/vcardenumarray.h b/src/libicalvcard/vcardenumarray.h
@@ -1,12 +1,11 @@
 #ifndef VCARDENUMARRAY_H
 #define VCARDENUMARRAY_H
 
-#include <stdlib.h>
-
 #include "libical_vcard_export.h"
-
 #include "icalarray.h"
 
+#include <stdlib.h>
+
 typedef icalarray vcardenumarray;
 
 typedef struct {

diff --git a/src/libicalvcard/vcardparameterimpl.h b/src/libicalvcard/vcardparameterimpl.h
@@ -6,9 +6,9 @@
 #ifndef VCARDPARAMETERIMPL_H
 #define VCARDPARAMETERIMPL_H
 
-#include "icalarray.h"
 #include "vcardproperty.h"
 #include "vcardderivedvalue.h"
+#include "icalarray.h"
 
 struct vcardparameter_impl
 {

diff --git a/src/libicalvcard/vcardparser.c b/src/libicalvcard/vcardparser.c
@@ -3,18 +3,22 @@
  * Based mostly on work by Bron Gondwana <[email protected]>
  */
 
-#include <ctype.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include "icalmemory.h"
-#include "vcardcomponent.h"
 #include "vcardparser.h"
+#include "vcardcomponent.h"
 #include "vcardparameter.h"
 #include "vcardproperty.h"
 #include "vcardvalue.h"
+#include "icalmemory.h"
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
 
 #define DEBUG 0
 

diff --git a/src/libicalvcard/vcardparser.h b/src/libicalvcard/vcardparser.h
@@ -2,7 +2,6 @@
 #define VCARDPARSER_H
 
 #include "libical_vcard_export.h"
-
 #include "vcardcomponent.h"
 
 LIBICAL_VCARD_EXPORT vcardcomponent *vcardparser_parse_string(const char *str);

diff --git a/src/libicalvcard/vcardproperty.c b/src/libicalvcard/vcardproperty.c
@@ -7,12 +7,12 @@
 #include <config.h>
 #endif
 
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "vcardparser.h"
-#include "vcardcomponent.h"
 #include "vcardproperty_p.h"
+#include "vcardcomponent.h"
+#include "vcardparser.h"
 #include "vcardvalue.h"
+#include "icalerror.h"
+#include "icalmemory.h"
 #include "pvl.h"
 
 #include <stdlib.h>

diff --git a/src/libicalvcard/vcardproperty.h b/src/libicalvcard/vcardproperty.h
@@ -7,7 +7,7 @@
 #define VCARDPROPERTY_H
 
 #include "libical_vcard_export.h"
-#include "vcardderivedproperty.h"       /* To get vcardproperty_kind enumerations */
+#include "vcardderivedproperty.h"    /* To get vcardproperty_kind enumerations */
 
 #include <stdarg.h>     /* for va_... */
 

diff --git a/src/libicalvcard/vcardstrarray.c b/src/libicalvcard/vcardstrarray.c
@@ -1,7 +1,11 @@
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include "icalmemory.h"
 #include "vcardstrarray.h"
+#include "icalmemory.h"
+
+#include <string.h>
 
 ssize_t vcardstrarray_find(vcardstrarray *array,
                            const char *needle)

diff --git a/src/libicalvcard/vcardstrarray.h b/src/libicalvcard/vcardstrarray.h
@@ -1,12 +1,11 @@
 #ifndef VCARDSTRARRAY_H
 #define VCARDSTRARRAY_H
 
-#include <stdlib.h>
-
 #include "libical_vcard_export.h"
-
 #include "icalarray.h"
 
+#include <stdlib.h>
+
 typedef icalarray vcardstrarray;
 
 #define vcardstrarray_new(increment_size)           \

diff --git a/src/libicalvcard/vcardstructured.c b/src/libicalvcard/vcardstructured.c
@@ -1,10 +1,14 @@
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include "vcardstructured.h"
 #include "icalerror.h"
 #include "icalmemory.h"
-#include "vcardstructured.h"
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 
 vcardstructuredtype *vcardstructured_new(void)
 {

diff --git a/src/libicalvcard/vcardstructured.h b/src/libicalvcard/vcardstructured.h
@@ -2,7 +2,6 @@
 #define VCARDSTRUCTURED_H
 
 #include "libical_vcard_export.h"
-
 #include "vcardstrarray.h"
 
 #define VCARD_MAX_STRUCTURED_FIELDS 20  // Extended ADR currently uses 18

diff --git a/src/libicalvcard/vcardtime.c b/src/libicalvcard/vcardtime.c
@@ -1,12 +1,16 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "vcardtime.h"
+#include "icalmemory.h"
+
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "icalmemory.h"
-#include "vcardtime.h"
-
 vcardtimetype vcardtime_null_datetime(void)
 {
     vcardtimetype t = { -1, -1, -1, -1, -1, -1, -1 };

diff --git a/src/libicalvcard/vcardtypes.h b/src/libicalvcard/vcardtypes.h
@@ -6,8 +6,6 @@
 typedef struct vcardgeotype {
     const char *uri;
     struct {
-        //        double lat;
-        //        double lon;
         const char *lat;
         const char *lon;
     } coords;

diff --git a/src/libicalvcard/vcardvalueimpl.h b/src/libicalvcard/vcardvalueimpl.h
@@ -6,8 +6,8 @@
 #ifndef VCARDVALUEIMPL_H
 #define VCARDVALUEIMPL_H
 
-#include "vcardproperty.h"
 #include "vcardderivedvalue.h"
+#include "vcardproperty.h"
 #include "vcardtime.h"
 
 struct vcardvalue_impl