Module Name: src Committed By: maya Date: Wed Feb 8 18:03:57 UTC 2017
Modified Files: src/lib/libc/sys: accept4.c Log Message: oops, do not write the same file twice -- accidentally ran patch twice To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/sys/accept4.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libc/sys/accept4.c diff -u src/lib/libc/sys/accept4.c:1.1 src/lib/libc/sys/accept4.c:1.2 --- src/lib/libc/sys/accept4.c:1.1 Wed Feb 8 17:58:41 2017 +++ src/lib/libc/sys/accept4.c Wed Feb 8 18:03:57 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $ */ +/* $NetBSD: accept4.c,v 1.2 2017/02/08 18:03:57 maya Exp $ */ /*- * Copyright (c) 2017 The NetBSD Foundation, Inc. @@ -27,49 +27,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $"); - -#include "namespace.h" -#include <sys/socket.h> - -#include <stddef.h> - -int -accept4(int s, struct sockaddr * restrict addr, socklen_t * restrict addrlen, - int flags) -{ - return paccept(s, addr, addrlen, NULL, flags); -} -/* $NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $ */ - -/*- - * Copyright (c) 2017 The NetBSD Foundation, Inc. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -__RCSID("$NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $"); +__RCSID("$NetBSD: accept4.c,v 1.2 2017/02/08 18:03:57 maya Exp $"); #include "namespace.h" #include <sys/socket.h>