diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-10 19:01:25 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-10 19:01:25 +0200 |
| commit | 786c5bf957f8f7b78c7a0999908ff822e712b53e (patch) | |
| tree | d330ac099c5d75669ab5d8d21e880bc29521add8 /src/machine | |
| parent | 15af581253a3f25a71d4fa723bf1fdd22f842728 (diff) | |
| parent | e11d45682ed0ccdbdfe71a958718c836114a4610 (diff) | |
Merge pull request #1242 from poettering/no-off_t
Drop usage of off_t
Diffstat (limited to 'src/machine')
| -rw-r--r-- | src/machine/machine-dbus.c | 2 | ||||
| -rw-r--r-- | src/machine/machinectl.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index cc38116704..6aaaa8aa31 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -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); diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 7b8f6d1fab..ab113efb28 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -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) |