diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-10 18:16:18 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-10 18:16:18 +0200 |
| commit | 59f448cf15f94bc5ebfd5b254de6f2441d02fbec (patch) | |
| tree | 1d52fd0935cca0205c78fde6870abddb7aafd360 /src/core/load-fragment.c | |
| parent | f33be3119806f96898dda6ade492fbdcdf8f79b8 (diff) | |
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.
Diffstat (limited to 'src/core/load-fragment.c')
| -rw-r--r-- | src/core/load-fragment.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 3b02cd8085..00cc6f7373 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -2683,7 +2683,7 @@ int config_parse_memory_limit( void *userdata) { CGroupContext *c = data; - off_t bytes; + uint64_t bytes; int r; if (isempty(rvalue)) { @@ -2691,8 +2691,6 @@ int config_parse_memory_limit( return 0; } - assert_cc(sizeof(uint64_t) == sizeof(off_t)); - r = parse_size(rvalue, 1024, &bytes); if (r < 0) { log_syntax(unit, LOG_ERR, filename, line, EINVAL, @@ -2700,7 +2698,7 @@ int config_parse_memory_limit( return 0; } - c->memory_limit = (uint64_t) bytes; + c->memory_limit = bytes; return 0; } @@ -2887,7 +2885,7 @@ int config_parse_blockio_bandwidth( CGroupBlockIODeviceBandwidth *b; CGroupContext *c = data; const char *bandwidth; - off_t bytes; + uint64_t bytes; bool read; size_t n; int r; @@ -2941,7 +2939,7 @@ int config_parse_blockio_bandwidth( b->path = path; path = NULL; - b->bandwidth = (uint64_t) bytes; + b->bandwidth = bytes; b->read = read; LIST_PREPEND(device_bandwidths, c->blockio_device_bandwidths, b); @@ -3614,7 +3612,7 @@ void unit_dump_config_items(FILE *f) { { config_parse_int, "INTEGER" }, { config_parse_unsigned, "UNSIGNED" }, { config_parse_iec_size, "SIZE" }, - { config_parse_iec_off, "SIZE" }, + { config_parse_iec_uint64, "SIZE" }, { config_parse_si_size, "SIZE" }, { config_parse_bool, "BOOLEAN" }, { config_parse_string, "STRING" }, |