diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2013-06-02 12:12:14 -0400 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-06-02 12:12:14 -0400 |
| commit | 2a0f2910b128379f9e2a7a92b000ce9162e6f6a0 (patch) | |
| tree | d5252e0063b4ce69257a9a50cc757fbd5d76ece8 /src/libudev | |
| parent | adb162e7ef4bec157f907fc78426493a95ff4fe7 (diff) | |
Correct missing int to size_t change
This corrects a previously applied commit for upstream's
acd42fae59096d84e78f1c17bfcc0d8f96486341
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/libudev')
| -rw-r--r-- | src/libudev/libudev-util.c | 8 |
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. |