diff options
| author | Ken Murchison <murch@fastmail.com> | 2019-08-07 09:10:49 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2019-08-10 12:30:15 -0400 |
| commit | bc9c3ecf4157d076796e2fe2a6ae9be7333c5087 (patch) | |
| tree | c6de251b234c288189a9b3fee04d37496a419a2f | |
| parent | e05c4b2ac6c402866b536d7d46b6ca047786ec29 (diff) | |
| download | libical-git-bc9c3ecf4157d076796e2fe2a6ae9be7333c5087.tar.gz | |
icalcomponent.c: move test for zero parameters outside of the switch statement in icalcomponent_normalize()
| -rw-r--r-- | src/libical/icalcomponent.c | 83 |
1 files changed, 41 insertions, 42 deletions
diff --git a/src/libical/icalcomponent.c b/src/libical/icalcomponent.c index 49b3b34a..8faeeea9 100644 --- a/src/libical/icalcomponent.c +++ b/src/libical/icalcomponent.c @@ -2656,54 +2656,53 @@ void icalcomponent_normalize(icalcomponent *comp) int nparams = icalproperty_count_parameters(prop); /* Skip unparameterized properties having default values */ - switch (icalproperty_isa(prop)) { - case ICAL_CALSCALE_PROPERTY: - if ((nparams == 0) && - (strcmp("GREGORIAN", icalproperty_get_calscale(prop)) == 0)) { - icalproperty_free(prop); - continue; - } - break; + if (nparams == 0) { + switch (icalproperty_isa(prop)) { + case ICAL_CALSCALE_PROPERTY: + if (strcmp("GREGORIAN", icalproperty_get_calscale(prop)) == 0) { + icalproperty_free(prop); + continue; + } + break; - case ICAL_CLASS_PROPERTY: - if ((nparams == 0) && - (icalproperty_get_class(prop) == ICAL_CLASS_PUBLIC)) { - icalproperty_free(prop); - continue; - } - break; + case ICAL_CLASS_PROPERTY: + if (icalproperty_get_class(prop) == ICAL_CLASS_PUBLIC) { + icalproperty_free(prop); + continue; + } + break; - case ICAL_PRIORITY_PROPERTY: - if ((nparams == 0) && (icalproperty_get_priority(prop) == 0)) { - icalproperty_free(prop); - continue; - } - break; + case ICAL_PRIORITY_PROPERTY: + if (icalproperty_get_priority(prop) == 0) { + icalproperty_free(prop); + continue; + } + break; - case ICAL_TRANSP_PROPERTY: - if ((nparams == 0) && - (icalproperty_get_transp(prop) == ICAL_TRANSP_OPAQUE)) { - icalproperty_free(prop); - continue; - } - break; + case ICAL_TRANSP_PROPERTY: + if (icalproperty_get_transp(prop) == ICAL_TRANSP_OPAQUE) { + icalproperty_free(prop); + continue; + } + break; - case ICAL_REPEAT_PROPERTY: - if ((nparams == 0) && (icalproperty_get_repeat(prop) == 0)) { - icalproperty_free(prop); - continue; - } - break; + case ICAL_REPEAT_PROPERTY: + if (icalproperty_get_repeat(prop) == 0) { + icalproperty_free(prop); + continue; + } + break; - case ICAL_SEQUENCE_PROPERTY: - if ((nparams == 0) && (icalproperty_get_sequence(prop) == 0)) { - icalproperty_free(prop); - continue; - } - break; + case ICAL_SEQUENCE_PROPERTY: + if (icalproperty_get_sequence(prop) == 0) { + icalproperty_free(prop); + continue; + } + break; - default: - break; + default: + break; + } } icalproperty_normalize(prop); |