From: Richard Jones <rjones@trick.home.annexia.org>
Date: Mon, 14 Sep 2009 14:43:23 +0000 (+0100)
Subject: Fix type punning warning about use of CMSG_DATA in Rawhide.
X-Git-Tag: 1.0.69~7
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=f9071160c1a5fe21a825398a81ba3ca584892a4e;p=libguestfs.git

Fix type punning warning about use of CMSG_DATA in Rawhide.
---

diff --git a/fish/rc.c b/fish/rc.c
index 5d64c70..182c4f4 100644
--- a/fish/rc.c
+++ b/fish/rc.c
@@ -98,7 +98,8 @@ receive_stdout (int s)
 
   else {
     /* Extract the transferred file descriptor from the control data */
-    int fd = *(int *)CMSG_DATA (h);
+    unsigned char *data = CMSG_DATA (h);
+    int fd = *(int *)data;
 
     /* Duplicate the received file descriptor to stdout */
     dup2 (fd, STDOUT_FILENO);
@@ -146,7 +147,8 @@ send_stdout (int s)
   msg.msg_controllen  = controllen;
 
   /* Add STDOUT to the control data */
-  *(int *)CMSG_DATA (cmptr) = STDOUT_FILENO;
+  unsigned char *data = CMSG_DATA (cmptr);
+  *(int *)data = STDOUT_FILENO;
 
   if (sendmsg (s, &msg, 0) != 1) {
     perror ("sendmsg stdout fd");