tree-wide: never use the off_t unless glibc makes us use it
off_t is a really weird type as it is usually 64bit these days (at least in sane programs), but could theoretically be 32bit. We don't support off_t as 32bit builds though, but still constantly deal with safely converting from off_t to other types and back for no point. Hence, never use the type anymore. Always use uint64_t instead. This has various benefits, including that we can expose these values directly as D-Bus properties, and also that the values parse the same in all cases.
This commit is contained in:
@@ -423,7 +423,7 @@ int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, s
|
||||
_exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
r = copy_bytes(fd, pair[1], (off_t) -1, false);
|
||||
r = copy_bytes(fd, pair[1], (uint64_t) -1, false);
|
||||
if (r < 0)
|
||||
_exit(EXIT_FAILURE);
|
||||
|
||||
|
||||
@@ -2385,13 +2385,9 @@ static int set_limit(int argc, char *argv[], void *userdata) {
|
||||
if (streq(argv[argc-1], "-"))
|
||||
limit = (uint64_t) -1;
|
||||
else {
|
||||
off_t off;
|
||||
|
||||
r = parse_size(argv[argc-1], 1024, &off);
|
||||
r = parse_size(argv[argc-1], 1024, &limit);
|
||||
if (r < 0)
|
||||
return log_error("Failed to parse size: %s", argv[argc-1]);
|
||||
|
||||
limit = (uint64_t) off;
|
||||
}
|
||||
|
||||
if (argc > 2)
|
||||
|
||||
Reference in New Issue
Block a user