From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 25 Aug 2018 10:17:36 +0000 (+0200)
Subject: monitor: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/
X-Git-Tag: lxc-3.1.0~127^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=397a8d30a8497aeafc992f4c596e54ee19037e94;p=thirdparty%2Flxc.git

monitor: s/LXC_NUMSTRLEN64/INTTYPE_TO_STRLEN()/

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/monitor.c b/src/lxc/monitor.c
index 5aa8e6036..cdf15b659 100644
--- a/src/lxc/monitor.c
+++ b/src/lxc/monitor.c
@@ -46,6 +46,7 @@
 #include "error.h"
 #include "log.h"
 #include "lxclock.h"
+#include "macro.h"
 #include "monitor.h"
 #include "state.h"
 #include "utils.h"
@@ -299,7 +300,7 @@ int lxc_monitord_spawn(const char *lxcpath)
 {
 	int ret;
 	int pipefd[2];
-	char pipefd_str[LXC_NUMSTRLEN64];
+	char pipefd_str[INTTYPE_TO_STRLEN(int)];
 	pid_t pid1, pid2;
 
 	char *const args[] = {
@@ -370,8 +371,8 @@ int lxc_monitord_spawn(const char *lxcpath)
 
 	close(pipefd[0]);
 
-	ret = snprintf(pipefd_str, LXC_NUMSTRLEN64, "%d", pipefd[1]);
-	if (ret < 0 || ret >= LXC_NUMSTRLEN64) {
+	ret = snprintf(pipefd_str, INTTYPE_TO_STRLEN(int), "%d", pipefd[1]);
+	if (ret < 0 || ret >= INTTYPE_TO_STRLEN(int)) {
 		ERROR("Failed to create pid argument to pass to monitord.");
 		_exit(EXIT_FAILURE);
 	}