diff options
Diffstat (limited to 'miscutils/devfsd.c')
-rw-r--r-- | miscutils/devfsd.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 61b97dce4..5e3ee23b3 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -92,8 +92,8 @@ | |||
92 | #define DEVFS_PATHLEN 1024 | 92 | #define DEVFS_PATHLEN 1024 |
93 | /* Never change this otherwise the binary interface will change */ | 93 | /* Never change this otherwise the binary interface will change */ |
94 | 94 | ||
95 | struct devfsd_notify_struct | 95 | struct devfsd_notify_struct { |
96 | { /* Use native C types to ensure same types in kernel and user space */ | 96 | /* Use native C types to ensure same types in kernel and user space */ |
97 | unsigned int type; /* DEVFSD_NOTIFY_* value */ | 97 | unsigned int type; /* DEVFSD_NOTIFY_* value */ |
98 | unsigned int mode; /* Mode of the inode or device entry */ | 98 | unsigned int mode; /* Mode of the inode or device entry */ |
99 | unsigned int major; /* Major number of device entry */ | 99 | unsigned int major; /* Major number of device entry */ |
@@ -151,32 +151,27 @@ struct devfsd_notify_struct | |||
151 | #define AC_RMNEWCOMPAT 10 | 151 | #define AC_RMNEWCOMPAT 10 |
152 | #define AC_RESTORE 11 | 152 | #define AC_RESTORE 11 |
153 | 153 | ||
154 | struct permissions_type | 154 | struct permissions_type { |
155 | { | ||
156 | mode_t mode; | 155 | mode_t mode; |
157 | uid_t uid; | 156 | uid_t uid; |
158 | gid_t gid; | 157 | gid_t gid; |
159 | }; | 158 | }; |
160 | 159 | ||
161 | struct execute_type | 160 | struct execute_type { |
162 | { | ||
163 | char *argv[MAX_ARGS + 1]; /* argv[0] must always be the programme */ | 161 | char *argv[MAX_ARGS + 1]; /* argv[0] must always be the programme */ |
164 | }; | 162 | }; |
165 | 163 | ||
166 | struct copy_type | 164 | struct copy_type { |
167 | { | ||
168 | const char *source; | 165 | const char *source; |
169 | const char *destination; | 166 | const char *destination; |
170 | }; | 167 | }; |
171 | 168 | ||
172 | struct action_type | 169 | struct action_type { |
173 | { | ||
174 | unsigned int what; | 170 | unsigned int what; |
175 | unsigned int when; | 171 | unsigned int when; |
176 | }; | 172 | }; |
177 | 173 | ||
178 | struct config_entry_struct | 174 | struct config_entry_struct { |
179 | { | ||
180 | struct action_type action; | 175 | struct action_type action; |
181 | regex_t preg; | 176 | regex_t preg; |
182 | union | 177 | union |
@@ -189,8 +184,7 @@ struct config_entry_struct | |||
189 | struct config_entry_struct *next; | 184 | struct config_entry_struct *next; |
190 | }; | 185 | }; |
191 | 186 | ||
192 | struct get_variable_info | 187 | struct get_variable_info { |
193 | { | ||
194 | const struct devfsd_notify_struct *info; | 188 | const struct devfsd_notify_struct *info; |
195 | const char *devname; | 189 | const char *devname; |
196 | char devpath[STRING_LENGTH]; | 190 | char devpath[STRING_LENGTH]; |
@@ -1336,8 +1330,7 @@ static void expand_regexp(char *output, size_t outsize, const char *input, | |||
1336 | 1330 | ||
1337 | /* from compat_name.c */ | 1331 | /* from compat_name.c */ |
1338 | 1332 | ||
1339 | struct translate_struct | 1333 | struct translate_struct { |
1340 | { | ||
1341 | const char *match; /* The string to match to(up to length) */ | 1334 | const char *match; /* The string to match to(up to length) */ |
1342 | const char *format; /* Format of output, "%s" takes data past match string, | 1335 | const char *format; /* Format of output, "%s" takes data past match string, |
1343 | NULL is effectively "%s"(just more efficient) */ | 1336 | NULL is effectively "%s"(just more efficient) */ |