Date: Tue, 1 Jun 2010 14:50:00 +0000 (UTC) From: Robert Watson <rwatson@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r208706 - projects/capabilities8/lib/libcapsicum Message-ID: <201006011450.o51Eo0sF061967@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rwatson Date: Tue Jun 1 14:50:00 2010 New Revision: 208706 URL: http://svn.freebsd.org/changeset/base/208706 Log: Merge 177190 from the p4 TrustedBSD Capabilities branch to capabilities8: Remove unneeded count==0 check in libcapsicum. Submitted by: jona Modified: projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c Modified: projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c ============================================================================== --- projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c Tue Jun 1 14:47:46 2010 (r208705) +++ projects/capabilities8/lib/libcapsicum/libcapsicum_fdlist.c Tue Jun 1 14:50:00 2010 (r208706) @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#10 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#11 $ */ #include <sys/mman.h> @@ -467,12 +467,6 @@ lc_fdlist_reorder(struct lc_fdlist *lfp) LOCK(lfp); lfsp = lfp->lf_storage; - /* Do we really need to do this? */ - if (lfsp->count == 0) { - UNLOCK(lfp); - return (0); - } - /* * Identify the highest source file descriptor we care about so that * when we play the dup2() rearranging game, we don't overwrite any
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006011450.o51Eo0sF061967>