diff options
Diffstat (limited to 'miscutils/devfsd.c')
-rw-r--r-- | miscutils/devfsd.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 2e87261cf..24c953bac 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -803,8 +803,8 @@ static void action_execute(const struct devfsd_notify_struct *info, | |||
803 | 803 | ||
804 | 804 | ||
805 | static void action_copy(const struct devfsd_notify_struct *info, | 805 | static void action_copy(const struct devfsd_notify_struct *info, |
806 | const struct config_entry_struct *entry, | 806 | const struct config_entry_struct *entry, |
807 | const regmatch_t *regexpr, unsigned int numexpr) | 807 | const regmatch_t *regexpr, unsigned int numexpr) |
808 | /* [SUMMARY] Copy permissions. | 808 | /* [SUMMARY] Copy permissions. |
809 | <info> The devfs change. | 809 | <info> The devfs change. |
810 | <entry> The config file entry. | 810 | <entry> The config file entry. |
@@ -1259,11 +1259,11 @@ static int make_dir_tree(const char *path) | |||
1259 | } /* End Function make_dir_tree */ | 1259 | } /* End Function make_dir_tree */ |
1260 | 1260 | ||
1261 | static int expand_expression(char *output, unsigned int outsize, | 1261 | static int expand_expression(char *output, unsigned int outsize, |
1262 | const char *input, | 1262 | const char *input, |
1263 | const char *(*get_variable_func)(const char *variable, void *info), | 1263 | const char *(*get_variable_func)(const char *variable, void *info), |
1264 | void *info, | 1264 | void *info, |
1265 | const char *devname, | 1265 | const char *devname, |
1266 | const regmatch_t *ex, unsigned int numexp) | 1266 | const regmatch_t *ex, unsigned int numexp) |
1267 | /* [SUMMARY] Expand environment variables and regular subexpressions in string. | 1267 | /* [SUMMARY] Expand environment variables and regular subexpressions in string. |
1268 | <output> The output expanded expression is written here. | 1268 | <output> The output expanded expression is written here. |
1269 | <length> The size of the output buffer. | 1269 | <length> The size of the output buffer. |
@@ -1288,8 +1288,8 @@ static int expand_expression(char *output, unsigned int outsize, | |||
1288 | } /* End Function expand_expression */ | 1288 | } /* End Function expand_expression */ |
1289 | 1289 | ||
1290 | static void expand_regexp(char *output, size_t outsize, const char *input, | 1290 | static void expand_regexp(char *output, size_t outsize, const char *input, |
1291 | const char *devname, | 1291 | const char *devname, |
1292 | const regmatch_t *ex, unsigned int numex) | 1292 | const regmatch_t *ex, unsigned int numex) |
1293 | /* [SUMMARY] Expand all occurrences of the regular subexpressions \0 to \9. | 1293 | /* [SUMMARY] Expand all occurrences of the regular subexpressions \0 to \9. |
1294 | <output> The output expanded expression is written here. | 1294 | <output> The output expanded expression is written here. |
1295 | <outsize> The size of the output buffer. | 1295 | <outsize> The size of the output buffer. |
@@ -1385,7 +1385,7 @@ static struct translate_struct translate_table[] = | |||
1385 | }; | 1385 | }; |
1386 | 1386 | ||
1387 | const char *get_old_name(const char *devname, unsigned int namelen, | 1387 | const char *get_old_name(const char *devname, unsigned int namelen, |
1388 | char *buffer, unsigned int major, unsigned int minor) | 1388 | char *buffer, unsigned int major, unsigned int minor) |
1389 | /* [SUMMARY] Translate a kernel-supplied name into an old name. | 1389 | /* [SUMMARY] Translate a kernel-supplied name into an old name. |
1390 | <devname> The device name provided by the kernel. | 1390 | <devname> The device name provided by the kernel. |
1391 | <namelen> The length of the name. | 1391 | <namelen> The length of the name. |
@@ -1423,7 +1423,7 @@ const char *get_old_name(const char *devname, unsigned int namelen, | |||
1423 | }; | 1423 | }; |
1424 | 1424 | ||
1425 | for (trans = translate_table; trans->match != NULL; ++trans) { | 1425 | for (trans = translate_table; trans->match != NULL; ++trans) { |
1426 | len = strlen(trans->match); | 1426 | len = strlen(trans->match); |
1427 | 1427 | ||
1428 | if (strncmp(devname, trans->match, len) == 0) { | 1428 | if (strncmp(devname, trans->match, len) == 0) { |
1429 | if (trans->format == NULL) | 1429 | if (trans->format == NULL) |
@@ -1549,9 +1549,9 @@ static char *write_old_sd_name(char *buffer, | |||
1549 | /*EXPERIMENTAL_FUNCTION*/ | 1549 | /*EXPERIMENTAL_FUNCTION*/ |
1550 | 1550 | ||
1551 | int st_expr_expand(char *output, unsigned int length, const char *input, | 1551 | int st_expr_expand(char *output, unsigned int length, const char *input, |
1552 | const char *(*get_variable_func)(const char *variable, | 1552 | const char *(*get_variable_func)(const char *variable, |
1553 | void *info), | 1553 | void *info), |
1554 | void *info) | 1554 | void *info) |
1555 | /* [SUMMARY] Expand an expression using Borne Shell-like unquoted rules. | 1555 | /* [SUMMARY] Expand an expression using Borne Shell-like unquoted rules. |
1556 | <output> The output expanded expression is written here. | 1556 | <output> The output expanded expression is written here. |
1557 | <length> The size of the output buffer. | 1557 | <length> The size of the output buffer. |
@@ -1643,7 +1643,7 @@ st_expr_expand_out: | |||
1643 | static const char *expand_variable(char *buffer, unsigned int length, | 1643 | static const char *expand_variable(char *buffer, unsigned int length, |
1644 | unsigned int *out_pos, const char *input, | 1644 | unsigned int *out_pos, const char *input, |
1645 | const char *(*func)(const char *variable, | 1645 | const char *(*func)(const char *variable, |
1646 | void *info), | 1646 | void *info), |
1647 | void *info) | 1647 | void *info) |
1648 | /* [SUMMARY] Expand a variable. | 1648 | /* [SUMMARY] Expand a variable. |
1649 | <buffer> The buffer to write to. | 1649 | <buffer> The buffer to write to. |