chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: replace contexts hashmap with a plain array
[elogind.git]
/
src
/
shared
/
util.h
diff --git
a/src/shared/util.h
b/src/shared/util.h
index 61094cca2fbb4f45d544178a7d4c0cf41eb616a5..a8ccf20bb8268f4ed65246b45372968a9d27df0f 100644
(file)
--- a/
src/shared/util.h
+++ b/
src/shared/util.h
@@
-425,7
+425,7
@@
int sigaction_many(const struct sigaction *sa, ...);
int fopen_temporary(const char *path, FILE **_f, char **_temp_path);
ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll);
int fopen_temporary(const char *path, FILE **_f, char **_temp_path);
ssize_t loop_read(int fd, void *buf, size_t nbytes, bool do_poll);
-
ssize_
t loop_write(int fd, const void *buf, size_t nbytes, bool do_poll);
+
in
t loop_write(int fd, const void *buf, size_t nbytes, bool do_poll);
bool is_device_path(const char *path);
bool is_device_path(const char *path);
@@
-714,7
+714,7
@@
_alloc_(2, 3) static inline void *memdup_multiply(const void *p, size_t a, size_
return memdup(p, a * b);
}
return memdup(p, a * b);
}
-bool filename_is_
safe
(const char *p) _pure_;
+bool filename_is_
valid
(const char *p) _pure_;
bool path_is_safe(const char *p) _pure_;
bool string_is_safe(const char *p) _pure_;
bool string_has_cc(const char *p, const char *ok) _pure_;
bool path_is_safe(const char *p) _pure_;
bool string_is_safe(const char *p) _pure_;
bool string_has_cc(const char *p, const char *ok) _pure_;
@@
-883,6
+883,7
@@
int unlink_noerrno(const char *path);
(void *) memset(_new_, 0, _len_); \
})
(void *) memset(_new_, 0, _len_); \
})
+/* It's not clear what alignment glibc/gcc alloca() guarantee, hence provide a guaranteed safe version */
#define alloca_align(size, align) \
({ \
void *_ptr_; \
#define alloca_align(size, align) \
({ \
void *_ptr_; \
@@
-1015,8
+1016,9
@@
int bind_remount_recursive(const char *prefix, bool ro);
int fflush_and_check(FILE *f);
int fflush_and_check(FILE *f);
-char *tempfn_xxxxxx(const char *p);
-char *tempfn_random(const char *p);
+int tempfn_xxxxxx(const char *p, char **ret);
+int tempfn_random(const char *p, char **ret);
+int tempfn_random_child(const char *p, char **ret);
bool is_localhost(const char *hostname);
bool is_localhost(const char *hostname);