 @@ -1,14 +1,14 @@
-/*	$NetBSD: namespace.h,v 1.193 2018/01/05 20:30:51 kamil Exp $	*/
+/*	$NetBSD: namespace.h,v 1.194 2018/01/07 15:28:33 kamil Exp $	*/
 /*-
  * Copyright (c) 1997-2004 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.
 @@ -207,27 +207,26 @@
 #define allocaddrinfo		_allocaddrinfo
 #define alphasort		_alphasort
 #define arc4random		_arc4random
 #define arc4random_addrandom	_arc4random_addrandom
 #define arc4random_buf		_arc4random_buf
 #define arc4random_stir		_arc4random_stir
 #define arc4random_uniform	_arc4random_uniform
 #define asctime			_asctime
 #define asctime_r		_asctime_r
 #define asprintf		_asprintf
 #define asprintf_l		_asprintf_l
 #define asysctl			_asysctl
 #define asysctlbyname		_asysctlbyname
 #define atoi			_atoi
 #define atoll			_atoll
 #define authnone_create		_authnone_create
 #define authunix_create		_authunix_create
 #define authunix_create_default _authunix_create_default
 #define basename		_basename
 #define bindresvport		_bindresvport
 #define bindresvport_sa		_bindresvport_sa
 #define bm_comp			_bm_comp
 #define bm_exec			_bm_exec
 #define bm_free			_bm_free
 #define callrpc			_callrpc
 #define cdbr_close		_cdbr_close
 #define cdbr_find		_cdbr_find

 @@ -1,14 +1,14 @@
-/*	$NetBSD: atoi.c,v 1.13 2018/01/05 20:30:51 kamil Exp $	*/
+/*	$NetBSD: atoi.c,v 1.14 2018/01/07 15:28:33 kamil Exp $	*/
 /*
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  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.
 @@ -24,33 +24,27 @@
  * 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>
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)atoi.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: atoi.c,v 1.13 2018/01/05 20:30:51 kamil Exp $");
+__RCSID("$NetBSD: atoi.c,v 1.14 2018/01/07 15:28:33 kamil Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 #include "namespace.h"
 #include <assert.h>
 #include <stdlib.h>
 #ifdef __weak_alias
 __weak_alias(atoi,_atoi)
 #endif
 int
 atoi(const char *str)
+{
 	_DIAGASSERT(str != NULL);
 	return((int)strtol(str, (char **)NULL, 10));
+}

 @@ -1,26 +1,22 @@
 /*===- InstrProfilingFile.c - Write instrumentation to a file -------------===*\
 |*
 |*                     The LLVM Compiler Infrastructure
 |*
 |* This file is distributed under the University of Illinois Open Source
 |* License. See LICENSE.TXT for details.
 |*
 \*===----------------------------------------------------------------------===*/
 #ifdef _LIBC
 #include "namespace.h"
 #endif
 #include "InstrProfiling.h"
 #include "InstrProfilingInternal.h"
 #include "InstrProfilingUtil.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #define UNCONST(ptr) ((void *)(uintptr_t)(ptr))
 /* Return 1 if there is an error, otherwise return  0.  */
 static uint32_t fileWriter(ProfDataIOVec *IOVecs, uint32_t NumIOVecs,
                            void **WriterCtx) {