From: Max Kellermann <max.kellermann@gmail.com>
Date: Mon, 18 Nov 2024 11:33:01 +0000 (+0100)
Subject: disk-utils: make pointer arrays const
X-Git-Tag: v2.42-start~145^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7efb0dc45734ce9305203452049d4a7752db46f5;p=thirdparty%2Futil-linux.git

disk-utils: make pointer arrays const
---

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index bc1c87d83..948957c5e 100644
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -69,7 +69,7 @@
 #include "list.h"
 #include "blkdev.h"
 
-static const char *default_disks[] = {
+static const char *const default_disks[] = {
 #ifdef __GNU__
 		"/dev/hd0",
 		"/dev/sd0",
@@ -2247,7 +2247,7 @@ done:
 static int ui_help(void)
 {
 	size_t i;
-	static const char *help[] = {
+	static const char *const help[] = {
 		N_("This is cfdisk, a curses-based disk partitioning program."),
 		N_("It lets you create, delete, and modify partitions on a block device."),
 		"  ",
diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c
index f1edeb7db..24c4e0404 100644
--- a/disk-utils/fdisk-list.c
+++ b/disk-utils/fdisk-list.c
@@ -250,7 +250,7 @@ int list_freespace_get_table(struct fdisk_context *cxt,
 	char *strsz;
 	int rc = 0, ct = 0;
 
-	static const char *colnames[] = { N_("Start"), N_("End"), N_("Sectors"), N_("Size") };
+	static const char *const colnames[] = { N_("Start"), N_("End"), N_("Sectors"), N_("Size") };
 	static const int colids[] = { FDISK_FIELD_START, FDISK_FIELD_END, FDISK_FIELD_SECTORS, FDISK_FIELD_SIZE };
 
 	rc = fdisk_get_freespaces(cxt, &tb);
diff --git a/disk-utils/fdisk-list.h b/disk-utils/fdisk-list.h
index ccd982e59..1839301dd 100644
--- a/disk-utils/fdisk-list.h
+++ b/disk-utils/fdisk-list.h
@@ -41,7 +41,7 @@ enum {
 static inline int wipemode_from_string(const char *str)
 {
 	size_t i;
-	static const char *modes[] = {
+	static const char *const modes[] = {
 		[WIPEMODE_AUTO]   = "auto",
 		[WIPEMODE_NEVER]  = "never",
 		[WIPEMODE_ALWAYS] = "always"
diff --git a/disk-utils/fdisk-menu.c b/disk-utils/fdisk-menu.c
index 8df4ac8d2..4e5801bce 100644
--- a/disk-utils/fdisk-menu.c
+++ b/disk-utils/fdisk-menu.c
@@ -254,7 +254,7 @@ static const struct menu menu_bsd = {
 	}
 };
 
-static const struct menu *menus[] = {
+static const struct menu *const menus[] = {
 	&menu_gpt,
 	&menu_sun,
 	&menu_sgi,
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 7dc12e67a..5c0905872 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -75,14 +75,14 @@
 
 #define FSCK_RUNTIME_DIRNAME	"/run/fsck"
 
-static const char *ignored_types[] = {
+static const char *const ignored_types[] = {
 	"ignore",
 	"iso9660",
 	"sw",
 	NULL
 };
 
-static const char *really_wanted[] = {
+static const char *const really_wanted[] = {
 	"minix",
 	"ext2",
 	"ext3",
@@ -1097,7 +1097,7 @@ static int device_exists(const char *device)
 
 static int fs_ignored_type(struct libmnt_fs *fs)
 {
-	const char **ip, *type;
+	const char *const*ip, *type;
 
 	if (!mnt_fs_is_regularfs(fs))
 		return 1;