diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-29 23:43:18 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-29 23:43:18 +0000 |
commit | 89ef65f02463b27313ff0eba806aa6e4aec10716 (patch) | |
tree | 70eab3e72843b1418ef3d88437c1f1a19169bda8 /networking/ifupdown.c | |
parent | ab2aea44479fd6f519bccd651a37f30e792b7593 (diff) | |
download | busybox-w32-89ef65f02463b27313ff0eba806aa6e4aec10716.tar.gz busybox-w32-89ef65f02463b27313ff0eba806aa6e4aec10716.tar.bz2 busybox-w32-89ef65f02463b27313ff0eba806aa6e4aec10716.zip |
preparatory patch for -Wwrite-strings #5
Diffstat (limited to 'networking/ifupdown.c')
-rw-r--r-- | networking/ifupdown.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 4ec3d37a8..834c7fa7d 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -36,22 +36,19 @@ struct interface_defn_t; | |||
36 | 36 | ||
37 | typedef int execfn(char *command); | 37 | typedef int execfn(char *command); |
38 | 38 | ||
39 | struct method_t | 39 | struct method_t { |
40 | { | 40 | const char *name; |
41 | char *name; | ||
42 | int (*up)(struct interface_defn_t *ifd, execfn *e); | 41 | int (*up)(struct interface_defn_t *ifd, execfn *e); |
43 | int (*down)(struct interface_defn_t *ifd, execfn *e); | 42 | int (*down)(struct interface_defn_t *ifd, execfn *e); |
44 | }; | 43 | }; |
45 | 44 | ||
46 | struct address_family_t | 45 | struct address_family_t { |
47 | { | 46 | const char *name; |
48 | char *name; | ||
49 | int n_methods; | 47 | int n_methods; |
50 | const struct method_t *method; | 48 | const struct method_t *method; |
51 | }; | 49 | }; |
52 | 50 | ||
53 | struct mapping_defn_t | 51 | struct mapping_defn_t { |
54 | { | ||
55 | struct mapping_defn_t *next; | 52 | struct mapping_defn_t *next; |
56 | 53 | ||
57 | int max_matches; | 54 | int max_matches; |
@@ -65,14 +62,12 @@ struct mapping_defn_t | |||
65 | char **mapping; | 62 | char **mapping; |
66 | }; | 63 | }; |
67 | 64 | ||
68 | struct variable_t | 65 | struct variable_t { |
69 | { | ||
70 | char *name; | 66 | char *name; |
71 | char *value; | 67 | char *value; |
72 | }; | 68 | }; |
73 | 69 | ||
74 | struct interface_defn_t | 70 | struct interface_defn_t { |
75 | { | ||
76 | const struct address_family_t *address_family; | 71 | const struct address_family_t *address_family; |
77 | const struct method_t *method; | 72 | const struct method_t *method; |
78 | 73 | ||
@@ -82,8 +77,7 @@ struct interface_defn_t | |||
82 | struct variable_t *option; | 77 | struct variable_t *option; |
83 | }; | 78 | }; |
84 | 79 | ||
85 | struct interfaces_file_t | 80 | struct interfaces_file_t { |
86 | { | ||
87 | llist_t *autointerfaces; | 81 | llist_t *autointerfaces; |
88 | llist_t *ifaces; | 82 | llist_t *ifaces; |
89 | struct mapping_defn_t *mappings; | 83 | struct mapping_defn_t *mappings; |
@@ -105,7 +99,7 @@ enum { | |||
105 | 99 | ||
106 | static char **my_environ; | 100 | static char **my_environ; |
107 | 101 | ||
108 | static char *startup_PATH; | 102 | static const char *startup_PATH; |
109 | 103 | ||
110 | #if ENABLE_FEATURE_IFUPDOWN_IPV4 || ENABLE_FEATURE_IFUPDOWN_IPV6 | 104 | #if ENABLE_FEATURE_IFUPDOWN_IPV4 || ENABLE_FEATURE_IFUPDOWN_IPV6 |
111 | 105 | ||