chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
machine-id: fix missing initialization
[elogind.git]
/
src
/
shared
/
util.h
diff --git
a/src/shared/util.h
b/src/shared/util.h
index 7c3da08dd8856787a8937a882d79aba17e6eae6d..38851237ab15957762723d7023fb2bf12e6359bf 100644
(file)
--- a/
src/shared/util.h
+++ b/
src/shared/util.h
@@
-36,8
+36,9
@@
#include <dirent.h>
#include <sys/resource.h>
#include <stddef.h>
#include <dirent.h>
#include <sys/resource.h>
#include <stddef.h>
-#include <
systemd/sd-journal
.h>
+#include <
unistd
.h>
+#include <systemd/sd-journal.h>
#include "macro.h"
#include "time-util.h"
#include "macro.h"
#include "time-util.h"
@@
-538,6
+539,8
@@
static inline void journal_closep(sd_journal **j) {
sd_journal_close(*j);
}
sd_journal_close(*j);
}
+#define _cleanup_globfree_ __attribute__((cleanup(globfree)))
+
_malloc_ static inline void *malloc_multiply(size_t a, size_t b) {
if (_unlikely_(b == 0 || a > ((size_t) -1) / b))
return NULL;
_malloc_ static inline void *malloc_multiply(size_t a, size_t b) {
if (_unlikely_(b == 0 || a > ((size_t) -1) / b))
return NULL;
@@
-639,3
+642,9
@@
static inline void _reset_umask_(struct umask_struct *s) {
static inline unsigned u64log2(uint64_t n) {
return (n > 1) ? __builtin_clzll(n) ^ 63U : 0;
}
static inline unsigned u64log2(uint64_t n) {
return (n > 1) ? __builtin_clzll(n) ^ 63U : 0;
}
+
+static inline bool logind_running(void) {
+ return access("/run/systemd/seats/", F_OK) >= 0;
+}
+
+int unlink_noerrno(const char *path);