X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=25c00843ec51c31b8f82a1bfa2792ac216f537eb;hb=de1c301ed165eb4d04a0c9d4babe97912b5233bb;hp=f0dfe19ad46252e7b0b65148b2c1eb8fc30e3463;hpb=6282c859bdc6463cb25734dcfd3cf8628d951088;p=elogind.git diff --git a/src/shared/util.h b/src/shared/util.h index f0dfe19ad..25c00843e 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -36,6 +36,7 @@ #include #include #include +#include #include "macro.h" #include "time-util.h" @@ -531,6 +532,10 @@ static inline void umaskp(mode_t *u) { umask(*u); } +static inline void journal_closep(sd_journal **j) { + sd_journal_close(*j); +} + _malloc_ static inline void *malloc_multiply(size_t a, size_t b) { if (_unlikely_(b == 0 || a > ((size_t) -1) / b)) return NULL; @@ -574,6 +579,7 @@ int on_ac_power(void); int search_and_fopen(const char *path, const char *mode, const char **search, FILE **_f); int search_and_fopen_nulstr(const char *path, const char *mode, const char *search, FILE **_f); +int create_tmp_dir(char template[], char** dir_name); #define FOREACH_LINE(line, f, on_error) \ for (;;) \ @@ -599,3 +605,6 @@ static inline void *mempset(void *s, int c, size_t n) { memset(s, c, n); return (char*)s + n; } + +char *hexmem(const void *p, size_t l); +char *strextend(char **x, ...);