commands: switch to pid_t to send around pid

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

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 76b592a19565ca0a412da0f5574193bfafbd13f8..4ba8229874d02d4453861f2270d42ad4c1337080 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -329,13 +329,13 @@ int lxc_try_cmd(const char *name, const char *lxcpath)
 pid_t lxc_cmd_get_init_pid(const char *name, const char *lxcpath)
 {
        int ret, stopped;
-       intmax_t pid = -1;
+       pid_t pid = -1;
        struct lxc_cmd_rr cmd = {
                .req = {
                        .cmd = LXC_CMD_GET_INIT_PID
                },
                .rsp = {
-                       .data = INTMAX_TO_PTR(pid)
+                       .data = PID_TO_PTR(pid)
                }
        };
 
@@ -343,7 +343,7 @@ pid_t lxc_cmd_get_init_pid(const char *name, const char *lxcpath)
        if (ret < 0)
                return -1;
 
-       pid = PTR_TO_INTMAX(cmd.rsp.data);
+       pid = PTR_TO_PID(cmd.rsp.data);
        if (pid < 0)
                return -1;
 
@@ -357,10 +357,8 @@ static int lxc_cmd_get_init_pid_callback(int fd, struct lxc_cmd_req *req,
                                         struct lxc_handler *handler,
                                         struct lxc_epoll_descr *descr)
 {
-       intmax_t pid = handler->pid;
-
        struct lxc_cmd_rsp rsp = {
-               .data = INTMAX_TO_PTR(pid)
+               .data = PID_TO_PTR(handler->pid)
        };
 
        return lxc_cmd_rsp_send(fd, &rsp);

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 68bd6ca844d48551a74ae7e461650e3d28849e32..612fb11ea41e204e667705a58ecd0f3f03c8ba08 100644 (file)
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -414,8 +414,8 @@ enum {
 #define PTR_TO_INT(p) ((int)((intptr_t)(p)))
 #define INT_TO_PTR(u) ((void *)((intptr_t)(u)))
 
-#define PTR_TO_INTMAX(p) ((intmax_t)((intptr_t)(p)))
-#define INTMAX_TO_PTR(u) ((void *)((intptr_t)(u)))
+#define PTR_TO_PID(p) ((pid_t)((intptr_t)(p)))
+#define PID_TO_PTR(u) ((void *)((intptr_t)(u)))
 
 #define PTR_TO_UINT64(p) ((uint64_t)((intptr_t)(p)))