X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=5bf3e7b5a4218b6925da7f0f64583c308b9ed664;hb=890d8fe47755c3bad936389cf48ffa141cff41c9;hp=d45707b763deaf653b3ed75f65c80a3f5ed42b55;hpb=b83e03c49920557f292d3861f42d0109e6fa03ea;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index d45707b76..5bf3e7b5a 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -16,7 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <lttng/ust-ctl.h>
@@ -47,7 +46,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,14 +247,14 @@ 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);
-	if (ret != 1) {
-		ret = -1;
+	ret = snprintf(cpu_nr, INT_MAX_STR_LEN, "%i", cpu);
+	if (ret < 0) {
+		PERROR("snprintf");
 		goto end;
 	}
 	strncat(stream_shm_path, cpu_nr,