summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Murchison <murch@fastmail.com>2020-11-06 10:21:46 -0500
committerKen Murchison <murch@fastmail.com>2020-11-06 10:21:46 -0500
commit93f952cd6a4ba445b2a3cef7d6b25eeefb5e79df (patch)
treeed115ef375bc4415b336bb0af0ded29d9bb37704
parent2f8c227931f719e8e1a17bc9a0f29cb264dba08b (diff)
downloadlibical-git-93f952cd6a4ba445b2a3cef7d6b25eeefb5e79df.tar.gz
icalrecur.c: move freq_map, skip_map, and wd_map to read-only section (based on patch from dilyanpalauzov)
-rw-r--r--src/libical/icalrecur.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libical/icalrecur.c b/src/libical/icalrecur.c
index 329718b5..912fea6e 100644
--- a/src/libical/icalrecur.c
+++ b/src/libical/icalrecur.c
@@ -196,10 +196,10 @@ int icalrecurrencetype_rscale_is_supported(void)
/****************** Enumeration Routines ******************/
-static struct freq_map
+static const struct freq_map
{
icalrecurrencetype_frequency kind;
- const char *str;
+ const char str[9];
} freq_map[] = {
{ICAL_SECONDLY_RECURRENCE, "SECONDLY"},
{ICAL_MINUTELY_RECURRENCE, "MINUTELY"},
@@ -208,7 +208,7 @@ static struct freq_map
{ICAL_WEEKLY_RECURRENCE, "WEEKLY"},
{ICAL_MONTHLY_RECURRENCE, "MONTHLY"},
{ICAL_YEARLY_RECURRENCE, "YEARLY"},
- {ICAL_NO_RECURRENCE, 0}
+ {ICAL_NO_RECURRENCE, ""}
};
icalrecurrencetype_frequency icalrecur_string_to_freq(const char *str)
@@ -235,15 +235,15 @@ const char *icalrecur_freq_to_string(icalrecurrencetype_frequency kind)
return 0;
}
-static struct skip_map
+static const struct skip_map
{
icalrecurrencetype_skip kind;
- const char *str;
+ const char str[9];
} skip_map[] = {
{ICAL_SKIP_BACKWARD, "BACKWARD"},
{ICAL_SKIP_FORWARD, "FORWARD"},
{ICAL_SKIP_OMIT, "OMIT"},
- {ICAL_SKIP_UNDEFINED, 0}
+ {ICAL_SKIP_UNDEFINED, ""}
};
icalrecurrencetype_skip icalrecur_string_to_skip(const char *str)
@@ -270,10 +270,10 @@ const char *icalrecur_skip_to_string(icalrecurrencetype_skip kind)
return 0;
}
-static struct wd_map
+static const struct wd_map
{
icalrecurrencetype_weekday wd;
- const char *str;
+ const char str[3];
} wd_map[] = {
{ICAL_SUNDAY_WEEKDAY, "SU"},
{ICAL_MONDAY_WEEKDAY, "MO"},
@@ -282,7 +282,7 @@ static struct wd_map
{ICAL_THURSDAY_WEEKDAY, "TH"},
{ICAL_FRIDAY_WEEKDAY, "FR"},
{ICAL_SATURDAY_WEEKDAY, "SA"},
- {ICAL_NO_WEEKDAY, 0}
+ {ICAL_NO_WEEKDAY, ""}
};
const char *icalrecur_weekday_to_string(icalrecurrencetype_weekday kind)