iovw: add simpler iovw_done() destructor

diff --git a/src/basic/iovec-wrapper.h b/src/basic/iovec-wrapper.h
index 0c6d760a73e98639e7944d1b3b33b5defe688cf2..4754b98fbb80fce83c68140672f262c5da206d65 100644 (file)
--- a/src/basic/iovec-wrapper.h
+++ b/src/basic/iovec-wrapper.h
@@ -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 */

diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
index 4dc0b8f662a8bf7bef05db2f76e4a412c9774342..9264638303f9e8b014a502a170d3970b62856cbd 100644 (file)
--- a/src/shared/journal-importer.c
+++ b/src/shared/journal-importer.c
@@ -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;