shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-04 21:47:31 +03:00
Code

libudev-util: adjust type of returned value by util_string_hash32()

Browse Source
This commit is contained in:
Yu Watanabe 2018-08-22 19:51:32 +09:00
parent 755c3fe9a7
commit 1544d17f73
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libudev/libudev-private.h
View File

@ -123,7 +123,7 @@ int util_log_priority(const char *priority);
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);
unsigned int util_string_hash32(const char *key);
uint32_t util_string_hash32(const char *key);
uint64_t util_string_bloom64(const char *str);
int util_resolve_subsys_kernel(const char *string, char *result, size_t maxsize, int read_value);

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

@ -84,8 +84,7 @@ int util_resolve_subsys_kernel(const char *string,
return 0;
}
int util_log_priority(const char *priority)
{
int util_log_priority(const char *priority) {
char *endptr;
int prio;
@ -100,8 +99,7 @@ int util_log_priority(const char *priority)
return log_level_from_string(priority);
}
size_t util_path_encode(const char *src, char *dest, size_t size)
{
size_t util_path_encode(const char *src, char *dest, size_t size) {
size_t i, j;
for (i = 0, j = 0; src[i] != '\0'; i++) {
@ -146,8 +144,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)
{
int util_replace_whitespace(const char *str, char *to, size_t len) {
size_t i, j;
/* strip trailing whitespace */
@ -175,8 +172,7 @@ 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)
{
int util_replace_chars(char *str, const char *white) {
size_t i = 0;
int replaced = 0;
@ -229,21 +225,18 @@ int util_replace_chars(char *str, const char *white)
*
* Returns: 0 if the entire string was copied, non-zero otherwise.
**/
_public_ int udev_util_encode_string(const char *str, char *str_enc, size_t len)
{
_public_ int udev_util_encode_string(const char *str, char *str_enc, size_t len) {
return encode_devnode_name(str, str_enc, len);
}
unsigned int util_string_hash32(const char *str)
{
uint32_t util_string_hash32(const char *str) {
return MurmurHash2(str, strlen(str), 0);
}
/* get a bunch of bit numbers out of the hash, and set the bits in our bit field */
uint64_t util_string_bloom64(const char *str)
{
uint64_t util_string_bloom64(const char *str) {
uint64_t bits = 0;
unsigned int hash = util_string_hash32(str);
uint32_t hash = util_string_hash32(str);
bits |= 1LLU << (hash & 63);
bits |= 1LLU << ((hash >> 6) & 63);