From owner-svn-soc-all@FreeBSD.ORG  Sat Jun 29 19:59:38 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id DDDDCF33
 for <svn-soc-all@FreeBSD.org>; Sat, 29 Jun 2013 19:59:38 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 by mx1.freebsd.org (Postfix) with ESMTP id B5960126A
 for <svn-soc-all@FreeBSD.org>; Sat, 29 Jun 2013 19:59:38 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5TJxcP9015346
 for <svn-soc-all@FreeBSD.org>; Sat, 29 Jun 2013 19:59:38 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5TJxctg015344
 for svn-soc-all@FreeBSD.org; Sat, 29 Jun 2013 19:59:38 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Sat, 29 Jun 2013 19:59:38 GMT
Message-Id: <201306291959.r5TJxctg015344@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r253695 - soc2013/dpl/head/contrib/bzip2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Jun 2013 19:59:38 -0000

Author: dpl
Date: Sat Jun 29 19:59:38 2013
New Revision: 253695
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253695

Log:
  Resolved a silly bug with pointers.
  

Modified:
  soc2013/dpl/head/contrib/bzip2/bzip2.c

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Sat Jun 29 18:07:32 2013	(r253694)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Sat Jun 29 19:59:38 2013	(r253695)
@@ -234,7 +234,7 @@
    printf("sendfd on socket:%d fd:%d\n",s,fd);
 
    struct msghdr msg;   
-   struct cmsghdr *cmsg;
+   struct cmsghdr cmsg;
    char buf = { "!" };
    struct iovec io[1];
 
@@ -245,15 +245,15 @@
    msg.msg_namelen = 0;
    msg.msg_iov = io;
    msg.msg_iovlen = 1;
-   msg.msg_control = cmsg;
+   msg.msg_control = &cmsg;
    msg.msg_controllen = CMSG_LEN(sizeof(int));
 
    printf("About to set CMSG\n");
-   cmsg->cmsg_len = msg.msg_controllen;
-   cmsg->cmsg_level = SOL_SOCKET;
-   cmsg->cmsg_type = SCM_RIGHTS;
+   cmsg.cmsg_len = msg.msg_controllen;
+   cmsg.cmsg_level = SOL_SOCKET;
+   cmsg.cmsg_type = SCM_RIGHTS;
    printf("About to set CMSG_DATA as fd\n");
-   *(int *)CMSG_DATA(cmsg) = fd;
+   *(int *)CMSG_DATA(&cmsg) = fd;
    printf("CMSG_DATA = fd\n");
    if(sendmsg(s, &msg, 0) < 0)
       return -1;
@@ -266,7 +266,7 @@
 
    int fd;
    struct msghdr msg;   
-   struct cmsghdr *cmsg;
+   struct cmsghdr cmsg;
    char buf = { "!" };
    struct iovec io[1];
 
@@ -277,16 +277,16 @@
    msg.msg_namelen = 0;
    msg.msg_iov = io;
    msg.msg_iovlen = 1;
-   msg.msg_control = cmsg;
+   msg.msg_control = &cmsg;
    msg.msg_controllen = CMSG_LEN(sizeof(int));
 
-   cmsg->cmsg_len = msg.msg_controllen;
-   cmsg->cmsg_level = SOL_SOCKET;
-   cmsg->cmsg_type = SCM_RIGHTS;
-   /*Why does sendmsg set errno to 9 EBADF.*/
+   cmsg.cmsg_len = msg.msg_controllen;
+   cmsg.cmsg_level = SOL_SOCKET;
+   cmsg.cmsg_type = SCM_RIGHTS;
+   /*Why does sendmsg set errno to 9 EBADF??*/
    if(recvmsg(s, &msg, 0) < 0)
       return -1;
-   fd = *(int *)CMSG_DATA(cmsg);
+   fd = *(int *)CMSG_DATA(&cmsg);
    printf("recvfd() fd recieved: %d", fd);
    return 0;
 }