diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-11-21 16:35:20 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-11-21 16:35:20 +0900 |
commit | 646acebd58859d6f122918f9505f06dd971812cd (patch) | |
tree | ec9befeb969474e698f77e881ae9810f596bca71 /src | |
parent | 805a7097eed1c5de0628c577c7c1dba90fac6511 (diff) | |
download | systemd-646acebd58859d6f122918f9505f06dd971812cd.tar.gz |
libudev-util: make util_replace_*() return size_t
Diffstat (limited to 'src')
-rw-r--r-- | src/libudev/libudev-util.c | 7 | ||||
-rw-r--r-- | src/libudev/libudev-util.h | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c index d6362cac0c..4f88805ce1 100644 --- a/src/libudev/libudev-util.c +++ b/src/libudev/libudev-util.c @@ -129,7 +129,7 @@ size_t util_path_encode(const char *src, char *dest, size_t size) { * Note this may be called with 'str' == 'to', i.e. to replace whitespace * in-place in a buffer. This function can handle that situation. */ -int util_replace_whitespace(const char *str, char *to, size_t len) { +size_t util_replace_whitespace(const char *str, char *to, size_t len) { size_t i, j; assert(str); @@ -160,9 +160,8 @@ int util_replace_whitespace(const char *str, char *to, size_t len) { } /* allow chars in whitelist, plain ascii, hex-escaping and valid utf8 */ -int util_replace_chars(char *str, const char *white) { - size_t i = 0; - int replaced = 0; +size_t util_replace_chars(char *str, const char *white) { + size_t i = 0, replaced = 0; assert(str); diff --git a/src/libudev/libudev-util.h b/src/libudev/libudev-util.h index fb5558da88..8d6812b8a8 100644 --- a/src/libudev/libudev-util.h +++ b/src/libudev/libudev-util.h @@ -11,8 +11,8 @@ #define UTIL_LINE_SIZE 16384 #define UDEV_ALLOWED_CHARS_INPUT "/ $%?," size_t util_path_encode(const char *src, char *dest, size_t size); -int util_replace_whitespace(const char *str, char *to, size_t len); -int util_replace_chars(char *str, const char *white); +size_t util_replace_whitespace(const char *str, char *to, size_t len); +size_t util_replace_chars(char *str, const char *white); int util_resolve_subsys_kernel(const char *string, char *result, size_t maxsize, int read_value); /* Cleanup functions */ |