diff options
author | Allen Winter <allen.winter@kdab.com> | 2022-06-03 11:20:13 -0400 |
---|---|---|
committer | Allen Winter <allen.winter@kdab.com> | 2022-06-03 11:20:13 -0400 |
commit | 32c14b2e448199d0a9de91e9844ef32abf9e4747 (patch) | |
tree | e7292cd489a4d2e78aacc46427503ce007c79746 | |
parent | 0d932910200e77b884d89917545495215567a9f6 (diff) | |
download | libical-git-32c14b2e448199d0a9de91e9844ef32abf9e4747.tar.gz |
various - a few post-merge white space tweaks
-rw-r--r-- | .pre-commit-config.yaml | 2 | ||||
-rw-r--r-- | config.h.cmake | 5 | ||||
-rw-r--r-- | src/libical/icalrecur.c | 2 | ||||
-rw-r--r-- | src/libical/icalrecur.h | 2 | ||||
-rw-r--r-- | src/libical/icaltz-util.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 740fde24..c27d6da2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -26,7 +26,7 @@ repos: rev: v0.6.13 hooks: - id: cmake-lint - exclude: cmake/Toolchain-* + exclude: cmake/Toolchain-*|config.h.cmake - repo: https://github.com/markdownlint/markdownlint rev: v0.11.0 hooks: diff --git a/config.h.cmake b/config.h.cmake index 039a8446..904cf704 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -522,11 +522,10 @@ typedef ssize_t IO_SSIZE_T; #define localtime_r(tp,tmp) (localtime(tp)?(*(tmp)=*localtime(tp),(tmp)):0) #endif -/* +/* * Substitute functions for those from time.h but working with icaltime_t instead of time_t. - * icaltime_t is defined in config_public.h.cmake. */ - #cmakedefine USE_64BIT_ICALTIME_T 1 +#cmakedefine USE_64BIT_ICALTIME_T 1 #if (defined(USE_64BIT_ICALTIME_T) && (SIZEOF_TIME_T != 8)) #if defined(_MSC_VER) #define icaltime(timer) _time64(timer) diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c index c41e258d..93c73f49 100644 --- a/src/libical/icalrecur.c +++ b/src/libical/icalrecur.c @@ -3613,7 +3613,7 @@ short icalrecurrencetype_encode_month(int month, int is_leap) } int icalrecur_expand_recurrence(const char *rule, - icaltime_t start, int count, icaltime_t*array) + icaltime_t start, int count, icaltime_t *array) { struct icalrecurrencetype recur; icalrecur_iterator *ritr; diff --git a/src/libical/icalrecur.h b/src/libical/icalrecur.h index 98e74a75..b968a15b 100644 --- a/src/libical/icalrecur.h +++ b/src/libical/icalrecur.h @@ -367,7 +367,7 @@ LIBICAL_ICAL_EXPORT void icalrecur_iterator_free(icalrecur_iterator *); * back into local time before using them. */ LIBICAL_ICAL_EXPORT int icalrecur_expand_recurrence(const char *rule, icaltime_t start, - int count, icaltime_t*array); + int count, icaltime_t *array); /* ical_invalid_rrule_handling : * How should the ICAL library handle RRULEs with invalid BYxxx part combos? diff --git a/src/libical/icaltz-util.c b/src/libical/icaltz-util.c index 8abae608..627e2846 100644 --- a/src/libical/icaltz-util.c +++ b/src/libical/icaltz-util.c @@ -445,7 +445,7 @@ icalcomponent *icaltzutil_fetch_timezone(const char *location) const char *zonedir; FILE *f = NULL; char *full_path = NULL; - icaltime_t*transitions = NULL; + icaltime_t *transitions = NULL; char *r_trans = NULL, *temp; int *trans_idx = NULL; ttinfo *types = NULL; |