Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jan 2018 08:23:24 +0000 (UTC)
From:      Mariusz Zaborski <oshogbo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r327541 - head/lib/libcasper/libcasper
Message-ID:  <201801040823.w048NOT5054304@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oshogbo
Date: Thu Jan  4 08:23:23 2018
New Revision: 327541
URL: https://svnweb.freebsd.org/changeset/base/327541

Log:
  cap_unwrap should return a descriptor but also free the structure.

Modified:
  head/lib/libcasper/libcasper/libcasper.h

Modified: head/lib/libcasper/libcasper/libcasper.h
==============================================================================
--- head/lib/libcasper/libcasper/libcasper.h	Thu Jan  4 04:11:40 2018	(r327540)
+++ head/lib/libcasper/libcasper/libcasper.h	Thu Jan  4 08:23:23 2018	(r327541)
@@ -122,7 +122,15 @@ cap_wrap(int sock)
 #ifdef WITH_CASPER
 int	cap_unwrap(cap_channel_t *chan);
 #else
-#define	cap_unwrap(chan)	(chan->cch_fd)
+static inline int
+cap_unwrap(cap_channel_t *chan)
+{
+	int fd;
+
+	fd = chan->cch_fd;
+	free(chan);
+	return (fd);
+}
 #endif
 
 /*



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801040823.w048NOT5054304>