picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libudev-util: make util_replace_*() return size_t

This commit is contained in:
Yu Watanabe 2018-11-21 16:35:20 +09:00
parent 805a7097ee
commit 646acebd58
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libudev/libudev-util.c
View File

@ -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);

4
src/libudev/libudev-util.h
View File

@ -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 */