[PATCH] janitor: use char arrays for strings

From: maximilian attems <janitor@sternwelten.at>

Use char arrays instead of char* for strings:
 a. uses a single variable instead of two.
 b. shorter code.
 c. __initdata will be completely dropped.

diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
index aaa7ec0..83ef51d 100644 (file)
--- a/fs/ntfs/super.c
+++ b/fs/ntfs/super.c
@@ -1670,10 +1670,10 @@ static struct file_system_type ntfs_fs_type = {
 };
 
 /* Stable names for the slab caches. */
-static const char *ntfs_attr_ctx_cache_name = "ntfs_attr_ctx_cache";
-static const char *ntfs_name_cache_name = "ntfs_name_cache";
-static const char *ntfs_inode_cache_name = "ntfs_inode_cache";
-static const char *ntfs_big_inode_cache_name = "ntfs_big_inode_cache";
+static const char ntfs_attr_ctx_cache_name[] = "ntfs_attr_ctx_cache";
+static const char ntfs_name_cache_name[] = "ntfs_name_cache";
+static const char ntfs_inode_cache_name[] = "ntfs_inode_cache";
+static const char ntfs_big_inode_cache_name[] = "ntfs_big_inode_cache";
 
 static int __init init_ntfs_fs(void)
 {

diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index 1789f8b..073cafd 100644 (file)
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -574,7 +574,7 @@ int reiserfs_journal_in_proc( char *buffer, char **start, off_t offset,
 
 
 static struct proc_dir_entry *proc_info_root = NULL;
-static const char *proc_info_root_name = "fs/reiserfs";
+static const char proc_info_root_name[] = "fs/reiserfs";
 
 int reiserfs_proc_info_init( struct super_block *sb )
 {

diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
index 361dc0e..8a0340d 100644 (file)
--- a/usr/gen_init_cpio.c
+++ b/usr/gen_init_cpio.c
@@ -53,7 +53,7 @@ static void push_hdr(const char *s)
 static void cpio_trailer(void)
 {
        char s[256];
-       const char *name = "TRAILER!!!";
+       const char name[] = "TRAILER!!!";
 
        sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX"
               "%08X%08X%08X%08X%08X%08ZX%08X",