hygiene, satisfy gcc's idea of constant string arrays, addresses issue 143

hroptatyr · hroptatyr · commit 51ac0e033cfb · 2024-01-24T07:55:15.000Z
diff --git a/src/strptime.c b/src/strptime.c
@@ -54,7 +54,7 @@ const char *prog = "strptime";
 
 
 static int
-pars_line(struct tm *tm, const char *const *fmt, size_t nfmt, const char *line)
+pars_line(struct tm *tm, char *const *fmt, size_t nfmt, const char *line)
 {
 	for (size_t i = 0; i < nfmt; i++) {
 		if (fmt[i] && strptime(line, fmt[i], tm) != NULL) {
@@ -75,7 +75,7 @@ prnt_line(const char *ofmt, struct tm *tm)
 
 static int
 proc_line(
-	const char *ln, const char *const *fmt, size_t nfmt,
+	const char *ln, char *const *fmt, size_t nfmt,
 	const char *ofmt,
 	int quietp)
 {
@@ -94,7 +94,7 @@ proc_line(
 }
 
 static int
-proc_lines(const char *const *fmt, size_t nfmt, const char *ofmt, int quietp)
+proc_lines(char *const *fmt, size_t nfmt, const char *ofmt, int quietp)
 {
 	size_t lno = 0;
 	int rc = 0;

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ const char *prog = "strptime";`
`54`	`54`
`55`	`55`
`56`	`56`	`static int`
`57`		`-pars_line(struct tm tm, const char const fmt, size_t nfmt, const char line)`
	`57`	`+pars_line(struct tm tm, char const fmt, size_t nfmt, const char line)`
`58`	`58`	`{`
`59`	`59`	`for (size_t i = 0; i < nfmt; i++) {`
`60`	`60`	`if (fmt[i] && strptime(line, fmt[i], tm) != NULL) {`
`@@ -75,7 +75,7 @@ prnt_line(const char ofmt, struct tm tm)`
`75`	`75`
`76`	`76`	`static int`
`77`	`77`	`proc_line(`
`78`		`- const char ln, const char const *fmt, size_t nfmt,`
	`78`	`+ const char ln, char const *fmt, size_t nfmt,`
`79`	`79`	`const char *ofmt,`
`80`	`80`	`int quietp)`
`81`	`81`	`{`
`@@ -94,7 +94,7 @@ proc_line(`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`static int`
`97`		`-proc_lines(const char const fmt, size_t nfmt, const char *ofmt, int quietp)`
	`97`	`+proc_lines(char const fmt, size_t nfmt, const char *ofmt, int quietp)`
`98`	`98`	`{`
`99`	`99`	`size_t lno = 0;`
`100`	`100`	`int rc = 0;`