diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-09-10 18:39:23 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2008-09-10 18:39:23 +0200 |
| commit | ecc9ec579feb4b7cc86bcf7caed3cb841faf3c9e (patch) | |
| tree | ec4a377b0fb8729c7620d773f5a10eb10dbcc421 /udev/udev_rules.c | |
| parent | 75250977137c26f706fc1514aca7982107859b1c (diff) | |
convert to libudev and delete udev_utils_string.c
Diffstat (limited to 'udev/udev_rules.c')
| -rw-r--r-- | udev/udev_rules.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/udev/udev_rules.c b/udev/udev_rules.c index fce73e4293..a56ed4e176 100644 --- a/udev/udev_rules.c +++ b/udev/udev_rules.c @@ -863,7 +863,7 @@ found: size = sizeof(temp2)-1; while (size > 0 && isspace(temp2[size-1])) temp2[--size] = '\0'; - count = replace_chars(temp2, ALLOWED_CHARS_INPUT); + count = util_replace_chars(temp2, ALLOWED_CHARS_INPUT); if (count > 0) info(udevice->udev, "%i character(s) replaced\n" , count); strlcat(string, temp2, maxsize); @@ -921,7 +921,7 @@ found: strlcat(symlinks, name_loop->name, sizeof(symlinks)); strlcat(symlinks, " ", sizeof(symlinks)); } - remove_trailing_chars(symlinks, ' '); + util_remove_trailing_chars(symlinks, ' '); strlcat(string, symlinks, maxsize); } break; @@ -1240,10 +1240,10 @@ try_parent: int count; dbg(udevice->udev, "PROGRAM matches\n"); - remove_trailing_chars(result, '\n'); + util_remove_trailing_chars(result, '\n'); if (rule->string_escape == ESCAPE_UNSET || rule->string_escape == ESCAPE_REPLACE) { - count = replace_chars(result, ALLOWED_CHARS_INPUT); + count = util_replace_chars(result, ALLOWED_CHARS_INPUT); if (count > 0) info(udevice->udev, "%i character(s) replaced\n" , count); } @@ -1461,7 +1461,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice) udev_rules_apply_format(udevice, temp, sizeof(temp)); if (rule->string_escape == ESCAPE_UNSET || rule->string_escape == ESCAPE_REPLACE) { - count = replace_chars(temp, ALLOWED_CHARS_FILE " "); + count = util_replace_chars(temp, ALLOWED_CHARS_FILE " "); if (count > 0) info(udevice->udev, "%i character(s) replaced\n" , count); } @@ -1496,7 +1496,7 @@ int udev_rules_get_name(struct udev_rules *rules, struct udevice *udevice) udev_rules_apply_format(udevice, udevice->name, sizeof(udevice->name)); if (rule->string_escape == ESCAPE_UNSET || rule->string_escape == ESCAPE_REPLACE) { - count = replace_chars(udevice->name, ALLOWED_CHARS_FILE); + count = util_replace_chars(udevice->name, ALLOWED_CHARS_FILE); if (count > 0) info(udevice->udev, "%i character(s) replaced\n", count); } |