chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tmpfiles: add 'a' type to set ACLs
[elogind.git]
/
src
/
shared
/
util.h
diff --git
a/src/shared/util.h
b/src/shared/util.h
index d40c0b03788fd43819517774a710878a1dab3a3d..bfa56335cd1fd0458dfed25a37a483cf77920b66 100644
(file)
--- a/
src/shared/util.h
+++ b/
src/shared/util.h
@@
-45,12
+45,13
@@
#include <sys/inotify.h>
#if SIZEOF_PID_T == 4
#include <sys/inotify.h>
#if SIZEOF_PID_T == 4
-# define PID_
FMT "%" PRIu
32
+# define PID_
PRI PRIi
32
#elif SIZEOF_PID_T == 2
#elif SIZEOF_PID_T == 2
-# define PID_
FMT "%" PRIu
16
+# define PID_
PRI PRIi
16
#else
# error Unknown pid_t size
#endif
#else
# error Unknown pid_t size
#endif
+#define PID_FMT "%" PID_PRI
#if SIZEOF_UID_T == 4
# define UID_FMT "%" PRIu32
#if SIZEOF_UID_T == 4
# define UID_FMT "%" PRIu32
@@
-69,7
+70,7
@@
#endif
#if SIZEOF_TIME_T == 8
#endif
#if SIZEOF_TIME_T == 8
-# define PRI_TIME PRI
u
64
+# define PRI_TIME PRI
i
64
#elif SIZEOF_TIME_T == 4
# define PRI_TIME PRIu32
#else
#elif SIZEOF_TIME_T == 4
# define PRI_TIME PRIu32
#else
@@
-380,7
+381,7
@@
static inline uint32_t random_u32(void) {
if (!s) \
return log_oom(); \
} else { \
if (!s) \
return log_oom(); \
} else { \
- r = asprintf(&s, "%
u
", i); \
+ r = asprintf(&s, "%
i
", i); \
if (r < 0) \
return log_oom(); \
} \
if (r < 0) \
return log_oom(); \
} \
@@
-654,6
+655,8
@@
int getenv_for_pid(pid_t pid, const char *field, char **_value);
bool http_url_is_valid(const char *url) _pure_;
bool documentation_url_is_valid(const char *url) _pure_;
bool http_url_is_valid(const char *url) _pure_;
bool documentation_url_is_valid(const char *url) _pure_;
+bool http_etag_is_valid(const char *etag);
+
bool in_initrd(void);
void warn_melody(void);
bool in_initrd(void);
void warn_melody(void);
@@
-1065,3
+1068,8
@@
void release_lock_file(LockFile *f);
#define RLIMIT_MAKE_CONST(lim) ((struct rlimit) { lim, lim })
ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length);
#define RLIMIT_MAKE_CONST(lim) ((struct rlimit) { lim, lim })
ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length);
+
+void sigkill_wait(pid_t *pid);
+#define _cleanup_sigkill_wait_ _cleanup_(sigkill_wait)
+
+int syslog_parse_priority(const char **p, int *priority, bool with_facility);