From b6da71bf681857b945501774c956634f2852bab7 Mon Sep 17 00:00:00 2001 From: Emanuele Torre Date: Wed, 20 Mar 2024 00:22:54 +0100 Subject: declare static arrays const where possible Some static arrays that could be readonly memory were declared mutable. --- src/builtin.c | 2 +- src/jv_print.c | 4 ++-- src/util.c | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/builtin.c b/src/builtin.c index 05bd8592..5f24cfb8 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -1463,7 +1463,7 @@ static jv f_strptime(jq_state *jq, jv a, jv b) { static int jv2tm(jv a, struct tm *tm) { memset(tm, 0, sizeof(*tm)); - static size_t offsets[] = { + static const size_t offsets[] = { offsetof(struct tm, tm_year), offsetof(struct tm, tm_mon), offsetof(struct tm, tm_mday), diff --git a/src/jv_print.c b/src/jv_print.c index 44ff36f3..390b38c9 100644 --- a/src/jv_print.c +++ b/src/jv_print.c @@ -29,12 +29,12 @@ // the last color is used for object keys. static char color_bufs[8][16]; static const char *color_bufps[8]; -static const char* def_colors[] = +static const char *const def_colors[] = {COL("0;90"), COL("0;39"), COL("0;39"), COL("0;39"), COL("0;32"), COL("1;39"), COL("1;39"), COL("1;34")}; #define FIELD_COLOR (colors[7]) -static const char **colors = def_colors; +static const char *const *colors = def_colors; int jq_set_colors(const char *c) diff --git a/src/util.c b/src/util.c index 0d822d1c..4a5ba98c 100644 --- a/src/util.c +++ b/src/util.c @@ -533,32 +533,32 @@ static const unsigned char *find_string(const unsigned char *, int *, const char static char* utc = "UTC"; #endif /* RFC-822/RFC-2822 */ -static const char* const nast[] = { +static const char *const nast[] = { "EST", "CST", "MST", "PST", "\0\0\0" }; -static const char* const nadt[] = { +static const char *const nadt[] = { "EDT", "CDT", "MDT", "PDT", "\0\0\0" }; -static const char* weekday_name[] = +static const char *const weekday_name[] = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" }; -static const char* ab_weekday_name[] = +static const char *const ab_weekday_name[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; -static const char* month_name[] = +static const char *const month_name[] = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; -static const char* ab_month_name[] = +static const char *const ab_month_name[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; -static const char* am_pm[] = {"AM", "PM"}; +static const char *const am_pm[] = {"AM", "PM"}; /* -- cgit v1.2.3