summaryrefslogtreecommitdiff
path: root/src/basic/util.h
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-10 18:16:18 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-10 18:16:18 +0200
commit59f448cf15f94bc5ebfd5b254de6f2441d02fbec (patch)
tree1d52fd0935cca0205c78fde6870abddb7aafd360 /src/basic/util.h
parentf33be3119806f96898dda6ade492fbdcdf8f79b8 (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/basic/util.h')
-rw-r--r--src/basic/util.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/util.h b/src/basic/util.h
index 5fa44b5cf3..c7dff9a86d 100644
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -152,7 +152,7 @@ void close_many(const int fds[], unsigned n_fd);
int fclose_nointr(FILE *f);
FILE* safe_fclose(FILE *f);
-int parse_size(const char *t, off_t base, off_t *size);
+int parse_size(const char *t, uint64_t base, uint64_t *size);
int parse_boolean(const char *v) _pure_;
int parse_pid(const char *s, pid_t* ret_pid);
@@ -478,7 +478,7 @@ bool kexec_loaded(void);
int prot_from_flags(int flags) _const_;
-char *format_bytes(char *buf, size_t l, off_t t);
+char *format_bytes(char *buf, size_t l, uint64_t t);
int fd_wait_for_event(int fd, int event, usec_t timeout);