Mark constant static arrays in function bodies actually as const

nielsdos · nielsdos · commit 543134f88fdc · 2023-01-15T01:11:03.000+01:00
diff --git a/Zend/zend_strtod.c b/Zend/zend_strtod.c
@@ -959,7 +959,7 @@ pow5mult
 {
 	Bigint *b1, *p5, *p51;
 	int i;
-	static int p05[3] = { 5, 25, 125 };
+	static const int p05[3] = { 5, 25, 125 };
 
 	if ((i = k & 3))
 		b = multadd(b, p05[i-1], 0);
diff --git a/ext/fileinfo/libmagic/cdf_time.c b/ext/fileinfo/libmagic/cdf_time.c
@@ -100,7 +100,7 @@ cdf_timestamp_to_timespec(struct timespec *ts, cdf_timestamp_t t)
 {
 	struct tm tm;
 #ifdef HAVE_STRUCT_TM_TM_ZONE
-	static char UTC[] = "UTC";
+	static const char UTC[] = "UTC";
 #endif
 	int rdays;
 
diff --git a/ext/hash/hash_snefru.c b/ext/hash/hash_snefru.c
@@ -39,7 +39,7 @@ void ph(uint32_t h[16])
 
 static inline void Snefru(uint32_t input[16])
 {
-	static int shifts[4] = {16, 8, 16, 24};
+	static const int shifts[4] = {16, 8, 16, 24};
 	int b, index, rshift, lshift;
 	const uint32_t *t0,*t1;
 	uint32_t SBE,B00,B01,B02,B03,B04,B05,B06,B07,B08,B09,B10,B11,B12,B13,B14,B15;
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
@@ -906,7 +906,7 @@ static php_iconv_err_t _php_iconv_mime_encode(smart_str *pretval, const char *fn
 	char *out_p;
 	size_t out_left;
 	zend_string *encoded = NULL;
-	static int qp_table[256] = {
+	static const int qp_table[256] = {
 		3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 0x00 */
 		3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, /* 0x10 */
 		3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x20 */
diff --git a/ext/mbstring/libmbfl/mbfl/mbfilter.c b/ext/mbstring/libmbfl/mbfl/mbfilter.c
@@ -653,7 +653,7 @@ mime_header_encoder_block_collector(int c, void *data)
 static int
 mime_header_encoder_collector(int c, void *data)
 {
-	static int qp_table[256] = {
+	static const int qp_table[256] = {
 		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
 		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */
 		1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */

Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ pow5mult`
`959`	`959`	`{`
`960`	`960`	`Bigint b1, p5, *p51;`
`961`	`961`	`int i;`
`962`		`- static int p05[3] = { 5, 25, 125 };`
	`962`	`+ static const int p05[3] = { 5, 25, 125 };`
`963`	`963`
`964`	`964`	`if ((i = k & 3))`
`965`	`965`	`b = multadd(b, p05[i-1], 0);`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ cdf_timestamp_to_timespec(struct timespec *ts, cdf_timestamp_t t)`
`100`	`100`	`{`
`101`	`101`	`struct tm tm;`
`102`	`102`	`#ifdef HAVE_STRUCT_TM_TM_ZONE`
`103`		`- static char UTC[] = "UTC";`
	`103`	`+ static const char UTC[] = "UTC";`
`104`	`104`	`#endif`
`105`	`105`	`int rdays;`
`106`	`106`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ void ph(uint32_t h[16])`
`39`	`39`
`40`	`40`	`static inline void Snefru(uint32_t input[16])`
`41`	`41`	`{`
`42`		`- static int shifts[4] = {16, 8, 16, 24};`
	`42`	`+ static const int shifts[4] = {16, 8, 16, 24};`
`43`	`43`	`int b, index, rshift, lshift;`
`44`	`44`	`const uint32_t t0,t1;`
`45`	`45`	`uint32_t SBE,B00,B01,B02,B03,B04,B05,B06,B07,B08,B09,B10,B11,B12,B13,B14,B15;`
Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ mime_header_encoder_block_collector(int c, void *data)`
`653`	`653`	`static int`
`654`	`654`	`mime_header_encoder_collector(int c, void *data)`
`655`	`655`	`{`
`656`		`- static int qp_table[256] = {`
	`656`	`+ static const int qp_table[256] = {`
`657`	`657`	`1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */`
`658`	`658`	`1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x00 */`
`659`	`659`	`1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */`