mirrors/rmtfs
0
0
Fork 0
mirror of https://github.com/linux-msm/rmtfs.git synced 2024-11-23 12:14:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

sharedmem: use 'unsigned long long' for memory region parsing

Browse Source 
I see warnings like this:

sharedmem.c:89:44: warning: incompatible pointer types passing 'uint64_t *' (aka 'unsigned long long *') to parameter of type 'unsigned long *' [-Wincompatible-pointer-types]

Since 'unsigned long' might actually be smaller than 'uint64_t', we
should really upgrade to 'unsigned long long' parsing.

At the same time, the existing error handling was wrong: it should have
been looking for ULONG_MAX (per the man page). Convert that to
ULLONG_MAX to fix that bug while we're at it.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Brian Norris 2018-07-02 09:51:51 -07:00 committed by Bjorn Andersson
parent 5eb67a1fb5
commit 577aedad06
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sharedmem.c
View File

@ -23,9 +23,9 @@ struct rmtfs_mem {
};
static int parse_hex_sysattr(struct udev_device *dev, const char *name,
unsigned long *value)
uint64_t *value)
{
unsigned long val;
unsigned long long val;
const char *buf;
char *endptr;
@ -34,8 +34,8 @@ static int parse_hex_sysattr(struct udev_device *dev, const char *name,
return -ENOENT;
errno = 0;
val = strtoul(buf, &endptr, 16);
if ((val == LONG_MAX && errno == ERANGE) || endptr == buf) {
val = strtoull(buf, &endptr, 16);
if ((val == ULLONG_MAX && errno == ERANGE) || endptr == buf) {
return -errno;
}