Re: [PATCH 10/10] grep/pcre2: move definitions of pcre2_{malloc,free}
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Feb 10, 2021, 12:40 UTC
- Message-ID
- <nycvar.QRO.7.76.6.2102101339560.29765@tvgsbejvaqbjf.bet>
- In-Reply-To
- <20210204210556.25242-11-avarab@gmail.com>
Hi Ævar,
On Thu, 4 Feb 2021, Ævar Arnfjörð Bjarmason wrote:
> Move the definitions of the pcre2_{malloc,free} functions above the
> compile_pcre2_pattern() function they're used it. Before the precedings/it/in/
Thank you for this entire patch series. I like its intention and its execution.
Ciao, Dscho
Show 76 quoted lines
> commit they used to be needed earlier, but now we can move them to be
> adjacent to the other PCREv2 functions.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
> grep.c | 46 ++++++++++++++++++++++------------------------
> 1 file changed, 22 insertions(+), 24 deletions(-)
>
> diff --git a/grep.c b/grep.c
> index 2599f329cd..636ac48bf0 100644
> --- a/grep.c
> +++ b/grep.c
> @@ -40,30 +40,6 @@ static struct grep_opt grep_defaults = {
> .output = std_output,
> };
>
> -#ifdef USE_LIBPCRE2
> -#define GREP_PCRE2_DEBUG_MALLOC 0
> -
> -static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data)
> -{
> - void *pointer = malloc(size);
> -#if GREP_PCRE2_DEBUG_MALLOC
> - static int count = 1;
> - fprintf(stderr, "PCRE2:%p -> #%02d: alloc(%lu)\n", pointer, count++, size);
> -#endif
> - return pointer;
> -}
> -
> -static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data)
> -{
> -#if GREP_PCRE2_DEBUG_MALLOC
> - static int count = 1;
> - if (pointer)
> - fprintf(stderr, "PCRE2:%p -> #%02d: free()\n", pointer, count++);
> -#endif
> - free(pointer);
> -}
> -#endif
> -
> static const char *color_grep_slots[] = {
> [GREP_COLOR_CONTEXT] = "context",
> [GREP_COLOR_FILENAME] = "filename",
> @@ -355,6 +331,28 @@ static int is_fixed(const char *s, size_t len)
> }
>
> #ifdef USE_LIBPCRE2
> +#define GREP_PCRE2_DEBUG_MALLOC 0
> +
> +static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data)
> +{
> + void *pointer = malloc(size);
> +#if GREP_PCRE2_DEBUG_MALLOC
> + static int count = 1;
> + fprintf(stderr, "PCRE2:%p -> #%02d: alloc(%lu)\n", pointer, count++, size);
> +#endif
> + return pointer;
> +}
> +
> +static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data)
> +{
> +#if GREP_PCRE2_DEBUG_MALLOC
> + static int count = 1;
> + if (pointer)
> + fprintf(stderr, "PCRE2:%p -> #%02d: free()\n", pointer, count++);
> +#endif
> + free(pointer);
> +}
> +
> static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)
> {
> int error;
> --
> 2.30.0.284.gd98b1dd5eaa7
>
>