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/core | |
| parent | 15af581253a3f25a71d4fa723bf1fdd22f842728 (diff) | |
| parent | e11d45682ed0ccdbdfe71a958718c836114a4610 (diff) | |
Merge pull request #1242 from poettering/no-off_t
Drop usage of off_t
Diffstat (limited to 'src/core')
| -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" }, |