Merge pull request #1342 from brauner/2016-12-06/fix_printf_lxc_top

src/lxc/tools/lxc_top.c

@@ -21,11 +21,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define __STDC_FORMAT_MACROS /* Required for PRIu64 to work. */
 #include <errno.h>
+#include <inttypes.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <termios.h>
 #include <unistd.h>
 #include <sys/epoll.h>
@@ -337,16 +340,13 @@ static void stats_print(const char *name, const struct stats *stats,
 	} else {
 		gettimeofday(&time_val, NULL);
 		time_ms = (unsigned long long) (time_val.tv_sec) * 1000 + (unsigned long long) (time_val.tv_usec) / 1000;
-		printf("%llu,%s,%lu,%lu,%lu,%lu,%lu,%lu,%lu",
-		       time_ms,
-		       name,
-		       stats->cpu_use_nanos,
-		       stats->cpu_use_sys,
-		       stats->cpu_use_user,
-		       stats->blkio,
-		       stats->blkio_iops,
-		       stats->mem_used,
-		       stats->kmem_used);
+		printf("%" PRIu64 ",%s,%" PRIu64 ",%" PRIu64 ",%" PRIu64
+		       ",%" PRIu64 ",%" PRIu64 ",%" PRIu64 ",%" PRIu64,
+		       (uint64_t)time_ms, name, (uint64_t)stats->cpu_use_nanos,
+		       (uint64_t)stats->cpu_use_sys,
+		       (uint64_t)stats->cpu_use_user, (uint64_t)stats->blkio,
+		       (uint64_t)stats->blkio_iops, (uint64_t)stats->mem_used,
+		       (uint64_t)stats->kmem_used);
 	}
 
 }