SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-journal: propagate errors from ordered_hashmap_*()

Browse Source 
Instead of masking them with -ENOMEM.
This commit is contained in:
Frantisek Sumsal
2023-05-24 18:45:06 +02:00
parent 1469386b13
commit 08a8fd6e8d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/catalog.c
+7 -4
View File
@@ -147,6 +147,7 @@ static int finish_item(
_cleanup_free_ CatalogItem *i = NULL; _cleanup_free_ CatalogItem *i = NULL;
_cleanup_free_ char *combined = NULL; _cleanup_free_ char *combined = NULL;
char *prev; char *prev;
int r;
assert(h); assert(h);
assert(payload); assert(payload);
@@ -169,8 +170,9 @@ static int finish_item(
if (!combined) if (!combined)
return log_oom(); return log_oom();
if (ordered_hashmap_update(h, i, combined) < 0) r = ordered_hashmap_update(h, i, combined);
return log_oom(); if (r < 0)
return r;
TAKE_PTR(combined); TAKE_PTR(combined);
free(prev); free(prev);
@@ -180,8 +182,9 @@ static int finish_item(
if (!combined) if (!combined)
return log_oom(); return log_oom();
if (ordered_hashmap_put(h, i, combined) < 0) r = ordered_hashmap_put(h, i, combined);
return log_oom(); if (r < 0)
return r;
TAKE_PTR(i); TAKE_PTR(i);
TAKE_PTR(combined); TAKE_PTR(combined);