Hi.
This patch converts the file to use C99 initializers to improve
readability an remove warnings if '-W' is used.
Art Haas
===== net/irda/irsysctl.c 1.8 vs edited =====
--- 1.8/net/irda/irsysctl.c Fri Oct 11 12:34:27 2002
+++ edited/net/irda/irsysctl.c Wed Feb 12 17:02:30 2003
@@ -99,60 +99,175 @@
/* One file */
static ctl_table irda_table[] = {
- { DISCOVERY, "discovery", &sysctl_discovery,
- sizeof(int), 0644, NULL, &proc_dointvec },
- { DEVNAME, "devname", sysctl_devname,
- 65, 0644, NULL, &do_devname, &sysctl_string},
+ {
+ .ctl_name = DISCOVERY,
+ .procname = "discovery",
+ .data = &sysctl_discovery,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = DEVNAME,
+ .procname = "devname",
+ .data = sysctl_devname,
+ .maxlen = 65,
+ .mode = 0644,
+ .proc_handler = &do_devname,
+ .strategy = &sysctl_string
+ },
#ifdef CONFIG_IRDA_DEBUG
- { DEBUG, "debug", &irda_debug,
- sizeof(int), 0644, NULL, &proc_dointvec },
+ {
+ .ctl_name = DEBUG,
+ .procname = "debug",
+ .data = &irda_debug,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
#endif
#ifdef CONFIG_IRDA_FAST_RR
- { FAST_POLL, "fast_poll_increase", &sysctl_fast_poll_increase,
- sizeof(int), 0644, NULL, &proc_dointvec },
+ {
+ .ctl_name = FAST_POLL,
+ .procname = "fast_poll_increase",
+ .data = &sysctl_fast_poll_increase,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
#endif
- { DISCOVERY_SLOTS, "discovery_slots", &sysctl_discovery_slots,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_discovery_slots, &max_discovery_slots },
- { DISCOVERY_TIMEOUT, "discovery_timeout", &sysctl_discovery_timeout,
- sizeof(int), 0644, NULL, &proc_dointvec },
- { SLOT_TIMEOUT, "slot_timeout", &sysctl_slot_timeout,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_slot_timeout, &max_slot_timeout },
- { MAX_BAUD_RATE, "max_baud_rate", &sysctl_max_baud_rate,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_max_baud_rate, &max_max_baud_rate },
- { MIN_TX_TURN_TIME, "min_tx_turn_time", &sysctl_min_tx_turn_time,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_min_tx_turn_time, &max_min_tx_turn_time },
- { MAX_TX_DATA_SIZE, "max_tx_data_size", &sysctl_max_tx_data_size,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_max_tx_data_size, &max_max_tx_data_size },
- { MAX_TX_WINDOW, "max_tx_window", &sysctl_max_tx_window,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_max_tx_window, &max_max_tx_window },
- { MAX_NOREPLY_TIME, "max_noreply_time", &sysctl_max_noreply_time,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_max_noreply_time, &max_max_noreply_time },
- { WARN_NOREPLY_TIME, "warn_noreply_time", &sysctl_warn_noreply_time,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_warn_noreply_time, &max_warn_noreply_time },
- { LAP_KEEPALIVE_TIME, "lap_keepalive_time", &sysctl_lap_keepalive_time,
- sizeof(int), 0644, NULL, &proc_dointvec_minmax, &sysctl_intvec,
- NULL, &min_lap_keepalive_time, &max_lap_keepalive_time },
- { 0 }
+ {
+ .ctl_name = DISCOVERY_SLOTS,
+ .procname = "discovery_slots",
+ .data = &sysctl_discovery_slots,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_discovery_slots,
+ .extra2 = &max_discovery_slots
+ },
+ {
+ .ctl_name = DISCOVERY_TIMEOUT,
+ .procname = "discovery_timeout",
+ .data = &sysctl_discovery_timeout,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec
+ },
+ {
+ .ctl_name = SLOT_TIMEOUT,
+ .procname = "slot_timeout",
+ .data = &sysctl_slot_timeout,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_slot_timeout,
+ .extra2 = &max_slot_timeout
+ },
+ {
+ .ctl_name = MAX_BAUD_RATE,
+ .procname = "max_baud_rate",
+ .data = &sysctl_max_baud_rate,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_max_baud_rate,
+ .extra2 = &max_max_baud_rate
+ },
+ {
+ .ctl_name = MIN_TX_TURN_TIME,
+ .procname = "min_tx_turn_time",
+ .data = &sysctl_min_tx_turn_time,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_min_tx_turn_time,
+ .extra2 = &max_min_tx_turn_time
+ },
+ {
+ .ctl_name = MAX_TX_DATA_SIZE,
+ .procname = "max_tx_data_size",
+ .data = &sysctl_max_tx_data_size,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_max_tx_data_size,
+ .extra2 = &max_max_tx_data_size
+ },
+ {
+ .ctl_name = MAX_TX_WINDOW,
+ .procname = "max_tx_window",
+ .data = &sysctl_max_tx_window,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_max_tx_window,
+ .extra2 = &max_max_tx_window
+ },
+ {
+ .ctl_name = MAX_NOREPLY_TIME,
+ .procname = "max_noreply_time",
+ .data = &sysctl_max_noreply_time,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_max_noreply_time,
+ .extra2 = &max_max_noreply_time
+ },
+ {
+ .ctl_name = WARN_NOREPLY_TIME,
+ .procname = "warn_noreply_time",
+ .data = &sysctl_warn_noreply_time,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_warn_noreply_time,
+ .extra2 = &max_warn_noreply_time
+ },
+ {
+ .ctl_name = LAP_KEEPALIVE_TIME,
+ .procname = "lap_keepalive_time",
+ .data = &sysctl_lap_keepalive_time,
+ .maxlen = sizeof(int),
+ .mode = 0644,
+ .proc_handler = &proc_dointvec_minmax,
+ .strategy = &sysctl_intvec,
+ .extra1 = &min_lap_keepalive_time,
+ .extra2 = &max_lap_keepalive_time
+ },
+ { .ctl_name = 0 }
};
/* One directory */
static ctl_table irda_net_table[] = {
- { NET_IRDA, "irda", NULL, 0, 0555, irda_table },
- { 0 }
+ {
+ .ctl_name = NET_IRDA,
+ .procname = "irda",
+ .maxlen = 0,
+ .mode = 0555,
+ .child = irda_table
+ },
+ { .ctl_name = 0 }
};
/* The parent directory */
static ctl_table irda_root_table[] = {
- { CTL_NET, "net", NULL, 0, 0555, irda_net_table },
- { 0 }
+ {
+ .ctl_name = CTL_NET,
+ .procname = "net",
+ .maxlen = 0,
+ .mode = 0555,
+ .child = irda_net_table
+ },
+ { .ctl_name = 0 }
};
static struct ctl_table_header *irda_table_header;
--
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
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
