[lttng-dev] [PATCH lttng-tools 2/2] Fix: max_t/min_t macros are missing cast on input

Jérémie Galarneau jeremie.galarneau at efficios.com
Fri Nov 16 18:22:00 EST 2018


Merged all the way back to 2.9.

Thanks!
Jérémie

On Tue, Nov 13, 2018 at 12:12:21PM -0500, Mathieu Desnoyers wrote:
> The semantic expected from max_t and min_t is to perform the max/min
> comparison in the type provided as first parameter.
> 
> Cast the input parameters to the proper type before comparing them,
> rather than after. There is no more need to cast the result of the
> expression now that both inputs are cast to the right type.
> 
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
>  src/common/macros.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/common/macros.h b/src/common/macros.h
> index c521aacd..461202ff 100644
> --- a/src/common/macros.h
> +++ b/src/common/macros.h
> @@ -72,7 +72,7 @@ void *zmalloc(size_t len)
>  #endif
>  
>  #ifndef max_t
> -#define max_t(type, a, b)	((type) max(a, b))
> +#define max_t(type, a, b)	max((type) a, (type) b)
>  #endif
>  
>  #ifndef min
> @@ -80,7 +80,7 @@ void *zmalloc(size_t len)
>  #endif
>  
>  #ifndef min_t
> -#define min_t(type, a, b)	((type) min(a, b))
> +#define min_t(type, a, b)	min((type) a, (type) b)
>  #endif
>  
>  #ifndef LTTNG_PACKED
> -- 
> 2.11.0
> 


More information about the lttng-dev mailing list