Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Oct 22, 2024
1 parent aaf2f0c commit 1b9a678
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 24 deletions.
14 changes: 4 additions & 10 deletions src/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -202,22 +202,16 @@ if(NOT CYGWIN AND NOT USE_32BIT_TIME_T)
set(reference_data "icalrecur_withouticu_test.out")
endif()
set(test_args "-f ${PROJECT_BINARY_DIR}/src/test/${reference_data}")
add_test(
NAME icalrecurtest-r
COMMAND
${CMAKE_COMMAND} -D test_cmd=${test_cmd} -D test_args:string=${test_args}
-P ${PROJECT_SOURCE_DIR}/cmake/run_test.cmake
add_test(NAME icalrecurtest-r COMMAND ${CMAKE_COMMAND} -D test_cmd=${test_cmd} -D test_args:string=${test_args} -P
${PROJECT_SOURCE_DIR}/cmake/run_test.cmake
)
setprops(icalrecurtest-r)

#test non-rscale rrules
set(reference_data "icalrecur_test.out")
set(test_args "-f ${PROJECT_BINARY_DIR}/src/test/${reference_data}")
add_test(
NAME icalrecurtest
COMMAND
${CMAKE_COMMAND} -D test_cmd=${test_cmd} -D test_args:string=${test_args}
-P ${PROJECT_SOURCE_DIR}/cmake/run_test.cmake
add_test(NAME icalrecurtest COMMAND ${CMAKE_COMMAND} -D test_cmd=${test_cmd} -D test_args:string=${test_args} -P
${PROJECT_SOURCE_DIR}/cmake/run_test.cmake
)
setprops(icalrecurtest)
endif()
Expand Down
25 changes: 11 additions & 14 deletions src/test/icalrecur_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ struct recur {
char rev_instances[2000];
};

int check_and_copy_field(const char *line, const char *pref, char *field, size_t field_size) {
int check_and_copy_field(const char *line, const char *pref, char *field, size_t field_size)
{
size_t l = strlen(pref);
if (strncmp(line, pref, l) != 0) {
return 0;
}

size_t data_size = strlen(line) - l;
if (data_size >= field_size )
if (data_size >= field_size)
return 1;

memcpy(field, &line[l], data_size + 1);
Expand All @@ -53,7 +54,7 @@ int main(int argc, char *argv[])

/* Do not use getopt for command line parsing -- for portability on Windows */
for (int i = 1; i < argc; ++i) {
if ((strncmp(argv[i], "-f", 2) == 0) && (argc > i +1)) {
if ((strncmp(argv[i], "-f", 2) == 0) && (argc > i + 1)) {
file_name = argv[++i];
continue;
}
Expand Down Expand Up @@ -97,11 +98,7 @@ int main(int argc, char *argv[])
if (l == 0)
yield = 1;
else {
if (check_and_copy_field(line, "RRULE:", r.rrule, sizeof(r.rrule))
|| check_and_copy_field(line, "DTSTART:", r.dtstart, sizeof(r.dtstart))
|| check_and_copy_field(line, "START-AT:", r.start_at, sizeof(r.start_at))
|| check_and_copy_field(line, "INSTANCES:", r.instances, sizeof(r.instances))
|| check_and_copy_field(line, "PREV-INSTANCES:", r.rev_instances, sizeof(r.rev_instances))) {
if (check_and_copy_field(line, "RRULE:", r.rrule, sizeof(r.rrule)) || check_and_copy_field(line, "DTSTART:", r.dtstart, sizeof(r.dtstart)) || check_and_copy_field(line, "START-AT:", r.start_at, sizeof(r.start_at)) || check_and_copy_field(line, "INSTANCES:", r.instances, sizeof(r.instances)) || check_and_copy_field(line, "PREV-INSTANCES:", r.rev_instances, sizeof(r.rev_instances))) {
nof_errors++;
fprintf(stderr, "line buffer overflow: %s\n", line);
}
Expand Down Expand Up @@ -136,17 +133,17 @@ int main(int argc, char *argv[])

if (!ritr) {
actual_instances_len += snprintf(&actual_instances[actual_instances_len],
sizeof(actual_instances) - actual_instances_len,
" *** %s", icalerror_strerror(icalerrno));
sizeof(actual_instances) - actual_instances_len,
" *** %s", icalerror_strerror(icalerrno));
} else {
if (r.start_at[0]) {
start = icaltime_from_string(r.start_at);
icalrecur_iterator_set_start(ritr, start);
}

for (next = icalrecur_iterator_next(ritr);
!icaltime_is_null_time(next);
next = icalrecur_iterator_next(ritr)) {
!icaltime_is_null_time(next);
next = icalrecur_iterator_next(ritr)) {
actual_instances_len += snprintf(&actual_instances[actual_instances_len],
sizeof(actual_instances) - actual_instances_len,
"%s%s", sep, icaltime_as_ical_string(next));
Expand Down Expand Up @@ -177,8 +174,8 @@ int main(int argc, char *argv[])
actual_instances_len = 0;

for (next = icalrecur_iterator_prev(ritr);
!icaltime_is_null_time(next);
next = icalrecur_iterator_prev(ritr)) {
!icaltime_is_null_time(next);
next = icalrecur_iterator_prev(ritr)) {
actual_instances_len += snprintf(&actual_instances[actual_instances_len],
sizeof(actual_instances) - actual_instances_len,
"%s%s", sep, icaltime_as_ical_string(next));
Expand Down

0 comments on commit 1b9a678

Please sign in to comment.