shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-08 08:58:27 +03:00
Code

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 14:17:25 +02:00
parent 1469386b13
commit 08a8fd6e8d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsystemd/sd-journal/catalog.c
View File

@ -147,6 +147,7 @@ static int finish_item(
_cleanup_free_ CatalogItem *i = NULL;
_cleanup_free_ char *combined = NULL;
char *prev;
int r;
assert(h);
assert(payload);
@ -169,8 +170,9 @@ static int finish_item(
if (!combined)
return log_oom();
if (ordered_hashmap_update(h, i, combined) < 0)
return log_oom();
r = ordered_hashmap_update(h, i, combined);
if (r < 0)
return r;
TAKE_PTR(combined);
free(prev);
@ -180,8 +182,9 @@ static int finish_item(
if (!combined)
return log_oom();
if (ordered_hashmap_put(h, i, combined) < 0)
return log_oom();
r = ordered_hashmap_put(h, i, combined);
if (r < 0)
return r;
TAKE_PTR(i);
TAKE_PTR(combined);