From da81d37a500e77586a4af82235c763ddb58e10dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Timm=20B=C3=A4der?= Date: Mon, 23 Nov 2020 13:27:02 +0100 Subject: [PATCH] segment_report_module: Remove nested release_buffer() function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Timm Bäder --- libdwfl/ChangeLog | 5 +++++ libdwfl/dwfl_segment_report_module.c | 16 ++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 3f8da55c4..7123b1824 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2020-11-23 Timm Bäder + + * segment_report_module.c (dwfl_segment_report_module): Remove + release_buffer, call memory_callback directly. + 2020-11-23 Timm Bäder * segment_report_module.c (dwfl_segment_report_module): Remove diff --git a/libdwfl/dwfl_segment_report_module.c b/libdwfl/dwfl_segment_report_module.c index a0d8d713d..6399d5d93 100644 --- a/libdwfl/dwfl_segment_report_module.c +++ b/libdwfl/dwfl_segment_report_module.c @@ -257,13 +257,6 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, GElf_Addr start = dwfl->lookup_addr[segment]; - inline void release_buffer (void **buffer, size_t *buffer_available) - { - if (*buffer != NULL) - (*memory_callback) (dwfl, -1, buffer, buffer_available, 0, 0, - memory_callback_arg); - } - /* First read in the file header and check its sanity. */ void *buffer = NULL; @@ -308,8 +301,8 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, inline void finish_portion (void **data, size_t *data_size) { - if (*data_size != 0) - release_buffer (data, data_size); + if (*data_size != 0 && *data != NULL) + (*memory_callback) (dwfl, -1, data, data_size, 0, 0, memory_callback_arg); } /* Extract the information we need from the file header. */ @@ -962,7 +955,10 @@ dwfl_segment_report_module (Dwfl *dwfl, int ndx, const char *name, out: free (phdrsp); - release_buffer (&buffer, &buffer_available); + if (buffer != NULL) + (*memory_callback) (dwfl, -1, &buffer, &buffer_available, 0, 0, + memory_callback_arg); + if (elf != NULL) elf_end (elf); if (fd != -1) -- 2.39.5