[PATCH] C99 initializers for drivers/cdrom/cdrom.c

From: Art Haas (ahaas@airmail.net)
Date: Sat Feb 15 2003 - 15:36:08 EST

Hi.

This patch switches the file to use C99 initializers in an effort to
improve readability and remove warnings if '-W' is used.

Art Haas

===== drivers/cdrom/cdrom.c 1.33 vs edited =====
--- 1.33/drivers/cdrom/cdrom.c Wed Jan 8 06:03:30 2003
+++ edited/drivers/cdrom/cdrom.c Sat Feb 15 12:14:19 2003
@@ -2542,33 +2542,81 @@
 
 /* Place files in /proc/sys/dev/cdrom */
 ctl_table cdrom_table[] = {
- {DEV_CDROM_INFO, "info", &cdrom_sysctl_settings.info,
- CDROM_STR_SIZE, 0444, NULL, &cdrom_sysctl_info},
- {DEV_CDROM_AUTOCLOSE, "autoclose", &cdrom_sysctl_settings.autoclose,
- sizeof(int), 0644, NULL, &cdrom_sysctl_handler },
- {DEV_CDROM_AUTOEJECT, "autoeject", &cdrom_sysctl_settings.autoeject,
- sizeof(int), 0644, NULL, &cdrom_sysctl_handler },
- {DEV_CDROM_DEBUG, "debug", &cdrom_sysctl_settings.debug,
- sizeof(int), 0644, NULL, &cdrom_sysctl_handler },
- {DEV_CDROM_LOCK, "lock", &cdrom_sysctl_settings.lock,
- sizeof(int), 0644, NULL, &cdrom_sysctl_handler },
- {DEV_CDROM_CHECK_MEDIA, "check_media", &cdrom_sysctl_settings.check,
- sizeof(int), 0644, NULL, &cdrom_sysctl_handler },
- {0}
- };
+ {
+ .ctl_name = DEV_CDROM_INFO,
+ .procname = "info",
+ .data = &cdrom_sysctl_settings.info,
+ .maxlen = CDROM_STR_SIZE,
+ .mode = 0444,
+ .proc_handler = &cdrom_sysctl_info,
+ },
+ {
+ .ctl_name = DEV_CDROM_AUTOCLOSE,
+ .procname = "autoclose",
+ .data = &cdrom_sysctl_settings.autoclose,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &cdrom_sysctl_handler,
+ },
+ {
+ .ctl_name = DEV_CDROM_AUTOEJECT,
+ .procname = "autoeject",
+ .data = &cdrom_sysctl_settings.autoeject,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &cdrom_sysctl_handler,
+ },
+ {
+ .ctl_name = DEV_CDROM_DEBUG,
+ .procname = "debug",
+ .data = &cdrom_sysctl_settings.debug,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &cdrom_sysctl_handler,
+ },
+ {
+ .ctl_name = DEV_CDROM_LOCK,
+ .procname = "lock",
+ .data = &cdrom_sysctl_settings.lock,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &cdrom_sysctl_handler,
+ },
+ {
+ .ctl_name = DEV_CDROM_CHECK_MEDIA,
+ .procname = "check_media",
+ .data = &cdrom_sysctl_settings.check,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &cdrom_sysctl_handler
+ },
+ { .ctl_name = 0 }
+};
 
 ctl_table cdrom_cdrom_table[] = {
- {DEV_CDROM, "cdrom", NULL, 0, 0555, cdrom_table},
- {0}
- };
+ {
+ .ctl_name = DEV_CDROM,
+ .procname = "cdrom",
+ .maxlen = 0,
+ .mode = 0555,
+ .child = cdrom_table,
+ },
+ { .ctl_name = 0 }
+};
 
 /* Make sure that /proc/sys/dev is there */
 ctl_table cdrom_root_table[] = {
 #ifdef CONFIG_PROC_FS
- {CTL_DEV, "dev", NULL, 0, 0555, cdrom_cdrom_table},
+ {
+ .ctl_name = CTL_DEV,
+ .procname = "dev",
+ .maxlen = 0,
+ .mode = 0555,
+ .child = cdrom_cdrom_table,
+ },
 #endif /* CONFIG_PROC_FS */
- {0}
- };
+ { .ctl_name = 0 }
+};
 static struct ctl_table_header *cdrom_sysctl_header;
 
 static void cdrom_sysctl_register(void) 

-- 
They that can give up essential liberty to obtain a little temporary safety
deserve neither liberty nor safety.
 -- Benjamin Franklin, Historical Review of Pennsylvania, 1759
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Sat Feb 15 2003 - 22:01:04 EST