summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libudev/libudev-util.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 7eff8b6a97..7c2cf7c22a 100644
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -244,8 +244,7 @@ int util_resolve_sys_link(struct udev *udev, char *syspath, size_t size)
return -EINVAL;
base[0] = '\0';
}
- if (base == NULL)
- return -EINVAL;
+
util_strscpyl(base, size - (base - syspath), "/", &link_target[back * 3], NULL);
return 0;
}
@@ -649,13 +648,12 @@ err:
/*
* http://sites.google.com/site/murmurhash/
- * (C) Austin Appleby (aappleby (AT) gmail) 2010
- *
+ *
* All code is released to the public domain. For business purposes,
* Murmurhash is under the MIT license.
*
*/
-static unsigned int murmur_hash2(const char *key, int len, unsigned int seed)
+static unsigned int murmur_hash2(const char *key, size_t len, unsigned int seed)
{
/*
* 'm' and 'r' are mixing constants generated offline.