return log_oom();
r = mkdir_p(d, 0775);
- if (r < 0) {
- log_error_errno(-r, "Recursive mkdir %s: %m", d);
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Recursive mkdir %s: %m", d);
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));
r = conf_files_list_strv(&files, ".catalog", root, dirs);
if (r < 0) {
- log_error_errno(-r, "Failed to get catalog files: %m");
+ log_error_errno(r, "Failed to get catalog files: %m");
goto finish;
}
r = write_catalog(database, h, sb, items, n);
if (r < 0)
- log_error_errno(-r, "Failed to write %s: %m", database);
+ 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);
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;