diff options
-rw-r--r-- | ReleaseNotes.txt | 1 | ||||
-rw-r--r-- | doc/UsingLibical.md | 6 | ||||
-rw-r--r-- | examples/access_components.c | 8 | ||||
-rw-r--r-- | examples/access_properties_and_parameters.c | 2 | ||||
-rw-r--r-- | src/libical/icalmime.c | 2 | ||||
-rw-r--r-- | src/libical/icalparser.c | 2 | ||||
-rw-r--r-- | src/libical/icalparser.h | 2 | ||||
-rw-r--r-- | src/libical/icalrestriction.c.in | 6 | ||||
-rw-r--r-- | src/libical/icalvalue.c | 6 | ||||
-rw-r--r-- | src/libicalss/icalmessage.c | 2 | ||||
-rw-r--r-- | src/libicalss/icalssyacc.c | 2 | ||||
-rw-r--r-- | src/libicalss/icalssyacc.y | 2 | ||||
-rw-r--r-- | src/test/regression-component.c | 18 | ||||
-rw-r--r-- | src/test/regression.c | 14 | ||||
-rw-r--r-- | src/test/testmime.c | 2 |
15 files changed, 39 insertions, 36 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 98826346..33fe52db 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -11,6 +11,7 @@ Version 3.0.15 (UNRELEASED): * Built-in timezones updated to tzdata2022d (now with a VTIMEZONE for each time zone alias) * Fix fuzzer issues * Handle unreachable-code compile warnings with clang + * Ensure all vanew_foo() calls finish with (void*)0 (not 0) Version 3.0.14 (05 February 2022): ---------------------------------- diff --git a/doc/UsingLibical.md b/doc/UsingLibical.md index f3e49d44..39e9901f 100644 --- a/doc/UsingLibical.md +++ b/doc/UsingLibical.md @@ -353,7 +353,7 @@ and the property constructor can have a list of parameters. *Be sure to terminate every list with a `NULL` (or a *`(void 0)`*, or your code will crash, if you are lucky*. The reason you can't use 0 itself is that -depending on what platform you are on, `sizeof(int) ≠ sizeof(void*)`. +depending on what platform you are on, `sizeof(int) ≠ sizeof(void *)`. #### 5.1.3 Parsing Text Files @@ -382,7 +382,7 @@ void icalparser_free( icalparser_get_line( icalparser *parser, - char* (*read_stream)(char *s, size_t size, void* d)); + char* (*read_stream)(char *s, size_t size, void *d)); icalparser_add_line( icalparser *parser, @@ -457,7 +457,7 @@ is a convenience routine; ```c icalcomponent* icalparser_parse( icalparser *parser, - char* (*line_gen_func)(char *s, size_t size, void* d)); + char* (*line_gen_func)(char *s, size_t size, void *d)); ``` To use this routine, you still must construct the parser object and diff --git a/examples/access_components.c b/examples/access_components.c index c0e3985f..0fbc3945 100644 --- a/examples/access_components.c +++ b/examples/access_components.c @@ -223,14 +223,14 @@ icalcomponent* create_new_component_with_va_args() icalproperty_vanew_organizer( "mailto:mrbig@host.com", icalparameter_new_role(ICAL_ROLE_CHAIR), - 0 + NULL ), icalproperty_vanew_attendee( "mailto:employee-A@host.com", icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT), icalparameter_new_rsvp(1), icalparameter_new_cutype(ICAL_CUTYPE_GROUP), - 0 + NULL ), icalproperty_new_description("Project XYZ Review Meeting"), @@ -241,12 +241,12 @@ icalcomponent* create_new_component_with_va_args() icalproperty_vanew_dtstart( atime, icalparameter_new_tzid("US-Eastern"), - 0 + NULL ), icalproperty_vanew_dtend( atime, icalparameter_new_tzid("US-Eastern"), - 0 + NULL ), icalproperty_new_location("1CP Conference Room 4350"), 0 diff --git a/examples/access_properties_and_parameters.c b/examples/access_properties_and_parameters.c index 9988dba0..1f0f92f1 100644 --- a/examples/access_properties_and_parameters.c +++ b/examples/access_properties_and_parameters.c @@ -115,7 +115,7 @@ void test_properties() icalparameter_new_cn("A Common Name 2"), icalparameter_new_cn("A Common Name 3"), icalparameter_new_cn("A Common Name 4"), - 0); + (void *)0); /* Iterate through all of the parameters in the property */ for(param = icalproperty_get_first_parameter(prop,ICAL_ANY_PARAMETER); diff --git a/src/libical/icalmime.c b/src/libical/icalmime.c index 37688d0f..45268f71 100644 --- a/src/libical/icalmime.c +++ b/src/libical/icalmime.c @@ -234,7 +234,7 @@ icalcomponent *icalmime_parse(char *(*get_string) (char *s, size_t size, void *d errParam = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_MIMEPARSEERROR); icalcomponent_add_property( comp, - icalproperty_vanew_xlicerror(temp, errParam, 0)); + icalproperty_vanew_xlicerror(temp, errParam, (void *)0)); icalparameter_free(errParam); } diff --git a/src/libical/icalparser.c b/src/libical/icalparser.c index 5ddab29b..3695bb62 100644 --- a/src/libical/icalparser.c +++ b/src/libical/icalparser.c @@ -608,7 +608,7 @@ static void insert_error(icalcomponent *comp, const char *text, icalcomponent_add_property( comp, - icalproperty_vanew_xlicerror(temp, icalparameter_new_xlicerrortype(type), 0)); + icalproperty_vanew_xlicerror(temp, icalparameter_new_xlicerrortype(type), (void *)0)); } static int line_is_blank(char *line) diff --git a/src/libical/icalparser.h b/src/libical/icalparser.h index 850bf33a..067200b4 100644 --- a/src/libical/icalparser.h +++ b/src/libical/icalparser.h @@ -278,7 +278,7 @@ LIBICAL_ICAL_EXPORT icalcomponent *icalparser_parse(icalparser *parser, * @param data The pointer which will be passed to the line_gen_func as argument `d` * * If you use any of the icalparser_parser() or icalparser_get_line() functions, - * the @a line_gen_func that they expect has a third `void* d` argument. This function + * the @a line_gen_func that they expect has a third `void *d` argument. This function * sets what will be passed to your @a line_gen_function as such argument. */ LIBICAL_ICAL_EXPORT void icalparser_set_gen_data(icalparser *parser, void *data); diff --git a/src/libical/icalrestriction.c.in b/src/libical/icalrestriction.c.in index 3931fcb0..f5fd77cc 100644 --- a/src/libical/icalrestriction.c.in +++ b/src/libical/icalrestriction.c.in @@ -345,7 +345,8 @@ static int icalrestriction_check_component(icalproperty_method method, icalcompo icalenum_property_kind_to_string(kind), restr_string_map[restr], count); errProp = icalproperty_vanew_xlicerror( - temp, icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_INVALIDITIP), 0); + temp, + icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_INVALIDITIP), (void *)0); icalcomponent_add_property(comp, errProp); icalproperty_free(errProp); #endif @@ -366,7 +367,8 @@ static int icalrestriction_check_component(icalproperty_method method, icalcompo errProp = icalproperty_vanew_xlicerror( - funcr, icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_INVALIDITIP), 0); + funcr, + icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_INVALIDITIP), (void *)0); icalcomponent_add_property(comp, errProp); icalproperty_free(errProp); compare = 0; diff --git a/src/libical/icalvalue.c b/src/libical/icalvalue.c index 308576a8..c18fad02 100644 --- a/src/libical/icalvalue.c +++ b/src/libical/icalvalue.c @@ -486,7 +486,7 @@ static icalvalue *icalvalue_new_from_string_with_error(icalvalue_kind kind, "Could not parse %s as a %s property", str, icalvalue_kind_to_string(kind)); errParam = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_VALUEPARSEERROR); - *error = icalproperty_vanew_xlicerror(temp, errParam, 0); + *error = icalproperty_vanew_xlicerror(temp, errParam, (void *)0); icalparameter_free(errParam); } break; @@ -622,7 +622,7 @@ static icalvalue *icalvalue_new_from_string_with_error(icalvalue_kind kind, "Could not parse %s as a %s property", str, icalvalue_kind_to_string(kind)); errParam = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_VALUEPARSEERROR); - *error = icalproperty_vanew_xlicerror(temp, errParam, 0); + *error = icalproperty_vanew_xlicerror(temp, errParam, (void *)0); icalparameter_free(errParam); } } @@ -737,7 +737,7 @@ static icalvalue *icalvalue_new_from_string_with_error(icalvalue_kind kind, snprintf(temp, TMP_BUF_SIZE, "Unknown type for \'%s\'", str); errParam = icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_VALUEPARSEERROR); - *error = icalproperty_vanew_xlicerror(temp, errParam, 0); + *error = icalproperty_vanew_xlicerror(temp, errParam, (void *)0); icalparameter_free(errParam); } diff --git a/src/libicalss/icalmessage.c b/src/libicalss/icalmessage.c index 33286261..59f844c4 100644 --- a/src/libicalss/icalmessage.c +++ b/src/libicalss/icalmessage.c @@ -272,7 +272,7 @@ icalcomponent *icalmessage_new_delegate_request(icalcomponent *c, delegateeParam = icalparameter_new_delegatedfrom(icalproperty_get_attendee(attendee)); icalcomponent_add_property( inner, - icalproperty_vanew_attendee(delegatee, delegateeParam, 0)); + icalproperty_vanew_attendee(delegatee, delegateeParam, (void *)0)); icalparameter_free(delegateeParam); return reply; } diff --git a/src/libicalss/icalssyacc.c b/src/libicalss/icalssyacc.c index e386ad80..75c383c7 100644 --- a/src/libicalss/icalssyacc.c +++ b/src/libicalss/icalssyacc.c @@ -1853,7 +1853,7 @@ static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1) assert(0); } - pvl_push(impl->from,(void*)ckind); + pvl_push(impl->from,(void *)ckind); } diff --git a/src/libicalss/icalssyacc.y b/src/libicalss/icalssyacc.y index eb5a18c4..c7e60b2f 100644 --- a/src/libicalss/icalssyacc.y +++ b/src/libicalss/icalssyacc.y @@ -241,7 +241,7 @@ static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1) assert(0); } - pvl_push(impl->from,(void*)ckind); + pvl_push(impl->from,(void *)ckind); } diff --git a/src/test/regression-component.c b/src/test/regression-component.c index 7efe3429..463e6bcb 100644 --- a/src/test/regression-component.c +++ b/src/test/regression-component.c @@ -336,7 +336,7 @@ void test_icalcomponent_get_span() c = icalcomponent_vanew( ICAL_VEVENT_COMPONENT, icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1, 0, azone), - icalparameter_new_tzid("America/Los_Angeles"), 0), + icalparameter_new_tzid("America/Los_Angeles"), (void *)0), icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2, 0, azone), icalparameter_new_tzid("America/Los_Angeles"), 0), (void *)0); @@ -356,8 +356,8 @@ void test_icalcomponent_get_span() */ c = icalcomponent_vanew( ICAL_VEVENT_COMPONENT, - icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1, 0, NULL), 0), - icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2, 0, NULL), 0), + icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1, 0, NULL), (void *)0), + icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2, 0, NULL), (void *)0), (void *)0); span = icalcomponent_get_span(c); @@ -375,9 +375,9 @@ void test_icalcomponent_get_span() c = icalcomponent_vanew( ICAL_VEVENT_COMPONENT, icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1, 0, azone), - icalparameter_new_tzid("America/New_York"), 0), + icalparameter_new_tzid("America/New_York"), (void *)0), icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2, 0, azone), - icalparameter_new_tzid("America/New_York"), 0), + icalparameter_new_tzid("America/New_York"), (void *)0), (void *)0); span = icalcomponent_get_span(c); @@ -398,10 +398,10 @@ void test_icalcomponent_get_span() c = icalcomponent_vanew( ICAL_VEVENT_COMPONENT, icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1, 0, azone), - icalparameter_new_tzid("America/New_York"), 0), + icalparameter_new_tzid("America/New_York"), (void *)0), icalproperty_vanew_dtend(icaltime_from_timet_with_zone(tm2, 0, bzone), - icalparameter_new_tzid("America/Los_Angeles"), 0), - (void *)0); + icalparameter_new_tzid("America/Los_Angeles"), (void *)0), + (void *)0); span = icalcomponent_get_span(c); if (VERBOSE) @@ -422,7 +422,7 @@ void test_icalcomponent_get_span() c = icalcomponent_vanew( ICAL_VEVENT_COMPONENT, icalproperty_vanew_dtstart(icaltime_from_timet_with_zone(tm1, 0, azone), - icalparameter_new_tzid("America/Los_Angeles"), 0), + icalparameter_new_tzid("America/Los_Angeles"), (void *)0), icalproperty_new_duration(dur), (void *)0); diff --git a/src/test/regression.c b/src/test/regression.c index 82b52915..7c25b999 100644 --- a/src/test/regression.c +++ b/src/test/regression.c @@ -4779,9 +4779,9 @@ static void test_implicit_dtend_duration(void) ICAL_VCALENDAR_COMPONENT, icalcomponent_vanew( ICAL_VEVENT_COMPONENT, - icalproperty_vanew_dtstart(start1, 0), - 0), - 0); + icalproperty_vanew_dtstart(start1, (void *)0), + (void *)0), + (void *)0); struct icaldurationtype d = icalcomponent_get_duration(c); struct icaltimetype end = icalcomponent_get_dtend(c), start = icaltime_from_string("20220108T101010Z"); @@ -4814,9 +4814,9 @@ static void test_implicit_dtend_duration(void) ICAL_VCALENDAR_COMPONENT, icalcomponent_vanew( ICAL_VTODO_COMPONENT, - icalproperty_vanew_dtstart(start1, 0), - 0), - 0); + icalproperty_vanew_dtstart(start1, (void *)0), + (void *)0), + (void *)0); icalcomponent_set_due(c, icaltime_from_string("20220109")); d = icalcomponent_get_duration(c); end = icalcomponent_get_dtend(c); @@ -4944,7 +4944,7 @@ static void test_remove_tzid_from_due(void) static void test_comma_in_xproperty(void) { - icalproperty *due = icalproperty_vanew_due(icaltime_from_string("20220120T120000"), 0); + icalproperty *due = icalproperty_vanew_due(icaltime_from_string("20220120T120000"), (void *)0); icalcomponent *c; icalproperty_add_parameter(due, icalparameter_new_tzid("America/New_York")); diff --git a/src/test/testmime.c b/src/test/testmime.c index e0c53ea9..c9ce6a2c 100644 --- a/src/test/testmime.c +++ b/src/test/testmime.c @@ -29,7 +29,7 @@ /*int sspm_parse_mime(struct sspm_part *parts, size_t max_parts, struct sspm_action_map *actions, - char* (*get_string)(char *s, size_t size, void* data), + char* (*get_string)(char *s, size_t size, void *data), void *get_string_data, struct sspm_header *first_header ); |