From mboxrd@z Thu Jan  1 00:00:00 1970
From: jeremie.galarneau@efficios.com (=?UTF-8?Q?J=C3=A9r=C3=A9mie_Galarneau?=)
Date: Mon, 21 Sep 2015 16:15:47 -0400
Subject: [lttng-dev] [PATCH lttng-tools] Fix: int printed as uint
In-Reply-To: <1442863170-18376-1-git-send-email-mjeanson@efficios.com>
References: <1442863170-18376-1-git-send-email-mjeanson@efficios.com>
Message-ID: <CA+jJMxuvNbfKXakOdCg+Hsztq7+2TqMNzOpPfSh4qGjpvjO-WQ@mail.gmail.com>

Merged in master and stable-2.7.

Thanks!
J?r?mie

On Mon, Sep 21, 2015 at 3:19 PM, Michael Jeanson <mjeanson at efficios.com> wrote:
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  src/common/ust-consumer/ust-consumer.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
> index 08e6ee0..481bbeb 100644
> --- a/src/common/ust-consumer/ust-consumer.c
> +++ b/src/common/ust-consumer/ust-consumer.c
> @@ -47,7 +47,7 @@
>
>  #include "ust-consumer.h"
>
> -#define UINT_MAX_STR_LEN 11    /* includes \0 */
> +#define INT_MAX_STR_LEN 12     /* includes \0 */
>
>  extern struct lttng_consumer_global_data consumer_data;
>  extern int consumer_poll_timeout;
> @@ -248,12 +248,12 @@ error:
>  static
>  int get_stream_shm_path(char *stream_shm_path, const char *shm_path, int cpu)
>  {
> -       char cpu_nr[UINT_MAX_STR_LEN];  /* unsigned int max len */
> +       char cpu_nr[INT_MAX_STR_LEN];  /* int max len */
>         int ret;
>
>         strncpy(stream_shm_path, shm_path, PATH_MAX);
>         stream_shm_path[PATH_MAX - 1] = '\0';
> -       ret = snprintf(cpu_nr, UINT_MAX_STR_LEN, "%u", cpu);
> +       ret = snprintf(cpu_nr, INT_MAX_STR_LEN, "%i", cpu);
>         if (ret < 0) {
>                 PERROR("snprintf");
>                 goto end;
> --
> 1.9.1
>



-- 
J?r?mie Galarneau
EfficiOS Inc.
http://www.efficios.com