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 new "C" line for copying files or directories
[elogind.git]
/
src
/
journal
/
sd-journal.c
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index b54bc21090bc14b9cc3afe45af857bb9670487d4..ca805f83fe41fb18ac831bc915db0c2624fd0edb 100644
(file)
--- a/
src/journal/sd-journal.c
+++ b/
src/journal/sd-journal.c
@@
-1273,7
+1273,7
@@
static bool file_type_wanted(int flags, const char *filename) {
if (flags & SD_JOURNAL_CURRENT_USER) {
char prefix[5 + DECIMAL_STR_MAX(uid_t) + 1];
if (flags & SD_JOURNAL_CURRENT_USER) {
char prefix[5 + DECIMAL_STR_MAX(uid_t) + 1];
- assert_se(snprintf(prefix, sizeof(prefix), "user-
%lu", (unsigned long)
getuid())
+ assert_se(snprintf(prefix, sizeof(prefix), "user-
"UID_FMT,
getuid())
< (int) sizeof(prefix));
if (file_has_type_prefix(prefix, filename))
< (int) sizeof(prefix));
if (file_has_type_prefix(prefix, filename))
@@
-1455,8
+1455,7
@@
static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
- log_debug("Failed to read directory %s: %s",
- m->path, strerror(errno));
+ log_debug("Failed to read directory %s: %m", m->path);
return r;
}
if (!de)
return r;
}
if (!de)
@@
-1546,8
+1545,7
@@
static int add_root_directory(sd_journal *j, const char *p) {
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
de = readdir(d);
if (!de && errno != 0) {
r = -errno;
- log_debug("Failed to read directory %s: %s",
- m->path, strerror(errno));
+ log_debug("Failed to read directory %s: %m", m->path);
return r;
}
if (!de)
return r;
}
if (!de)
@@
-1850,8
+1848,7
@@
_public_ void sd_journal_close(sd_journal *j) {
hashmap_free(j->directories_by_path);
hashmap_free(j->directories_by_wd);
hashmap_free(j->directories_by_path);
hashmap_free(j->directories_by_wd);
- if (j->inotify_fd >= 0)
- close_nointr_nofail(j->inotify_fd);
+ safe_close(j->inotify_fd);
if (j->mmap) {
log_debug("mmap cache statistics: %u hit, %u miss", mmap_cache_get_hit(j->mmap), mmap_cache_get_missed(j->mmap));
if (j->mmap) {
log_debug("mmap cache statistics: %u hit, %u miss", mmap_cache_get_hit(j->mmap), mmap_cache_get_missed(j->mmap));