merged into master, 2.9, 2.8, thanks!

Mathieu

----- On Mar 8, 2017, at 2:32 PM, Francis Deslauriers 
[email protected] wrote:

> Fixes the following compiler warning:
> 
> lttng-abi.c: In function ‘lttng_metadata_ioctl’:
> lttng-abi.c:971:6: warning: ‘ret’ may be used uninitialized in this function
> [-Wmaybe-uninitialized]
>  int ret;
>      ^
> 
> Signed-off-by: Francis Deslauriers <[email protected]>
> ---
> lttng-abi.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/lttng-abi.c b/lttng-abi.c
> index e193f43..478a591 100644
> --- a/lttng-abi.c
> +++ b/lttng-abi.c
> @@ -998,8 +998,11 @@ int lttng_abi_open_metadata_stream(struct file
> *channel_file)
>               goto notransport;
>       }
> 
> -     if (!lttng_kref_get(&session->metadata_cache->refcount))
> +     if (!lttng_kref_get(&session->metadata_cache->refcount)) {
> +             ret = -EOVERFLOW;
>               goto kref_error;
> +     }
> +
>       ret = lttng_abi_create_stream_fd(channel_file, stream_priv,
>                       &lttng_metadata_ring_buffer_file_operations);
>       if (ret < 0)
> --
> 2.7.4

-- 
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Reply via email to