[src/trunk]: src/lib/libc/sys oops, do not write the same file twice -- accid...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e41a65ca350c
branches:  trunk
changeset: 351273:e41a65ca350c
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Feb 08 18:03:57 2017 +0000

description:
oops, do not write the same file twice -- accidentally ran patch twice

diffstat:

 lib/libc/sys/accept4.c |  46 ++--------------------------------------------
 1 files changed, 2 insertions(+), 44 deletions(-)

diffs (64 lines):

diff -r 98bce7e929dc -r e41a65ca350c lib/libc/sys/accept4.c
--- a/lib/libc/sys/accept4.c    Wed Feb 08 18:01:24 2017 +0000
+++ b/lib/libc/sys/accept4.c    Wed Feb 08 18:03:57 2017 +0000
@@ -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,7 +27,7 @@
  */
 
 #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>
@@ -40,45 +40,3 @@
 {
        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 $");
-
-#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);
-}