mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-30 22:03:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

iovw: add simpler iovw_done() destructor

Browse Source
This commit is contained in:
Lennart Poettering 2024-10-31 16:00:13 +01:00
parent 2865561eaa
commit 811aa36ab6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/basic/iovec-wrapper.h
View File

@ -23,6 +23,10 @@ static inline void iovw_done_free(struct iovec_wrapper *iovw) {
iovw_free_contents(iovw, true);
}
static inline void iovw_done(struct iovec_wrapper *iovw) {
iovw_free_contents(iovw, false);
}
int iovw_put(struct iovec_wrapper *iovw, void *data, size_t len);
static inline int iovw_consume(struct iovec_wrapper *iovw, void *data, size_t len) {
/* Move data into iovw or free on error */

4
src/shared/journal-importer.c
View File

@ -33,7 +33,7 @@ void journal_importer_cleanup(JournalImporter *imp) {
free(imp->name);
free(imp->buf);
iovw_free_contents(&imp->iovw, false);
iovw_done(&imp->iovw);
}
static char* realloc_buffer(JournalImporter *imp, size_t size) {
@ -452,7 +452,7 @@ void journal_importer_drop_iovw(JournalImporter *imp) {
/* This function drops processed data that along with the iovw that points at it */
iovw_free_contents(&imp->iovw, false);
iovw_done(&imp->iovw);
/* possibly reset buffer position */
remain = imp->filled - imp->offset;