[Mesa-dev] [PATCH] st/mesa: replace REALLOC() with realloc()

[Jose Fonseca]

Reviewed-by: Jose Fonseca <jfonseca at vmware.com>

----- Original Message -----
> We should use the later since we're freeing the memory with free(),
> not the gallium FREE() macro.
> 
> This fixes a mismatch when using the gallium debug memory functions.
> 
> NOTE: This is a candidate for the 9.0 branch.
> ---
>  src/mesa/state_tracker/st_mesa_to_tgsi.c |   10 ++--------
>  1 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c
> b/src/mesa/state_tracker/st_mesa_to_tgsi.c
> index a023058..e0f0880 100644
> --- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
> +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
> @@ -118,11 +118,8 @@ static unsigned *get_label( struct st_translate
> *t,
>     unsigned i;
>  
>     if (t->labels_count + 1 >= t->labels_size) {
> -      unsigned old_size = t->labels_size;
>        t->labels_size = 1 << (util_logbase2(t->labels_size) + 1);
> -      t->labels = REALLOC( t->labels,
> -                           old_size * sizeof t->labels[0],
> -                           t->labels_size * sizeof t->labels[0] );
> +      t->labels = realloc(t->labels, t->labels_size * sizeof
> t->labels[0]);
>        if (t->labels == NULL) {
>           static unsigned dummy;
>           t->error = TRUE;
> @@ -146,11 +143,8 @@ static void set_insn_start( struct st_translate
> *t,
>                              unsigned start )
>  {
>     if (t->insn_count + 1 >= t->insn_size) {
> -      unsigned old_size = t->insn_size;
>        t->insn_size = 1 << (util_logbase2(t->insn_size) + 1);
> -      t->insn = REALLOC( t->insn,
> -                         old_size * sizeof t->insn[0],
> -                         t->insn_size * sizeof t->insn[0] );
> +      t->insn = realloc(t->insn, t->insn_size * sizeof t->insn[0]);
>        if (t->insn == NULL) {
>           t->error = TRUE;
>           return;
> --
> 1.7.3.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>