X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=ad9753655a9300524911b9710db53e68d0498551;hb=d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc;hp=38851237ab15957762723d7023fb2bf12e6359bf;hpb=4b73a0c0612d26d49791f389e92f85d6444c36af;p=elogind.git diff --git a/src/shared/util.h b/src/shared/util.h index 38851237a..ad9753655 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -52,7 +52,7 @@ union dirent_storage { #define WHITESPACE " \t\n\r" #define NEWLINE "\n\r" #define QUOTES "\"\'" -#define COMMENTS "#;\n" +#define COMMENTS "#;" #define FORMAT_BYTES_MAX 8 @@ -618,6 +618,8 @@ char *strextend(char **x, ...); char *strrep(const char *s, unsigned n); void* greedy_realloc(void **p, size_t *allocated, size_t need); +#define GREEDY_REALLOC(array, allocated, need) \ + greedy_realloc((void**) &(array), &(allocated), (sizeof *array) * (need)) static inline void _reset_errno_(int *saved_errno) { errno = *saved_errno; @@ -647,4 +649,11 @@ static inline bool logind_running(void) { return access("/run/systemd/seats/", F_OK) >= 0; } +static inline unsigned decimal_str_max(unsigned x) { + unsigned ans = 1; + while (x /= 10) + ans ++; + return ans; +} + int unlink_noerrno(const char *path);