chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: allow restarting journald without losing stream connections
[elogind.git]
/
src
/
journal
/
catalog.c
diff --git
a/src/journal/catalog.c
b/src/journal/catalog.c
index 41d450b1544d6fbf2e8e140e016b2b42c2625cc2..81a2e946e4867b30e31f7e6d80987b75ba2eea67 100644
(file)
--- a/
src/journal/catalog.c
+++ b/
src/journal/catalog.c
@@
-209,14
+209,12
@@
int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
assert(path);
f = fopen(path, "re");
assert(path);
f = fopen(path, "re");
- if (!f) {
- log_error("Failed to open file %s: %m", path);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to open file %s: %m", path);
r = catalog_file_lang(path, &deflang);
if (r < 0)
r = catalog_file_lang(path, &deflang);
if (r < 0)
- log_error
(
"Failed to determine language for file %s: %m", path);
+ log_error
_errno(errno,
"Failed to determine language for file %s: %m", path);
if (r == 1)
log_debug("File %s has language %s.", path, deflang);
if (r == 1)
log_debug("File %s has language %s.", path, deflang);
@@
-229,7
+227,7
@@
int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) {
if (feof(f))
break;
if (feof(f))
break;
- log_error
(
"Failed to read file %s: %m", path);
+ log_error
_errno(errno,
"Failed to read file %s: %m", path);
return -errno;
}
return -errno;
}
@@
-341,17
+339,13
@@
static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb,
return log_oom();
r = mkdir_p(d, 0775);
return log_oom();
r = mkdir_p(d, 0775);
- if (r < 0) {
- log_error("Recursive mkdir %s: %s", d, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Recursive mkdir %s: %m", d);
r = fopen_temporary(database, &w, &p);
r = fopen_temporary(database, &w, &p);
- if (r < 0) {
- log_error("Failed to open database for writing: %s: %s",
- database, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to open database for writing: %s: %m",
+ database);
zero(header);
memcpy(header.signature, CATALOG_SIGNATURE, sizeof(header.signature));
zero(header);
memcpy(header.signature, CATALOG_SIGNATURE, sizeof(header.signature));
@@
-389,7
+383,7
@@
static long write_catalog(const char *database, Hashmap *h, struct strbuf *sb,
fchmod(fileno(w), 0644);
if (rename(p, database) < 0) {
fchmod(fileno(w), 0644);
if (rename(p, database) < 0) {
- log_error
(
"rename (%s -> %s) failed: %m", p, database);
+ log_error
_errno(errno,
"rename (%s -> %s) failed: %m", p, database);
r = -errno;
goto error;
}
r = -errno;
goto error;
}
@@
-422,7
+416,7
@@
int catalog_update(const char* database, const char* root, const char* const* di
r = conf_files_list_strv(&files, ".catalog", root, dirs);
if (r < 0) {
r = conf_files_list_strv(&files, ".catalog", root, dirs);
if (r < 0) {
- log_error
("Failed to get catalog files: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to get catalog files: %m"
);
goto finish;
}
goto finish;
}
@@
-463,7
+457,7
@@
int catalog_update(const char* database, const char* root, const char* const* di
r = write_catalog(database, h, sb, items, n);
if (r < 0)
r = write_catalog(database, h, sb, items, n);
if (r < 0)
- log_error
("Failed to write %s: %s", database, strerror(-r)
);
+ log_error
_errno(r, "Failed to write %s: %m", database
);
else
log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.",
database, n, sb->len, r);
else
log_debug("%s: wrote %u items, with %zu bytes of strings, %ld total size.",
database, n, sb->len, r);
@@
-687,8
+681,8
@@
int catalog_list_items(FILE *f, const char *database, bool oneline, char **items
k = sd_id128_from_string(*item, &id);
if (k < 0) {
k = sd_id128_from_string(*item, &id);
if (k < 0) {
- log_error
("Failed to parse id128 '%s': %s
",
-
*item, strerror(-k)
);
+ log_error
_errno(k, "Failed to parse id128 '%s': %m
",
+
*item
);
if (r == 0)
r = k;
continue;
if (r == 0)
r = k;
continue;