[src/trunk]: src/usr.sbin/pf use strtonum from libc

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

details:   https://anonhg.NetBSD.org/src/rev/bfb4cbabac13
branches:  trunk
changeset: 335894:bfb4cbabac13
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jan 29 03:31:35 2015 +0000

description:
use strtonum from libc

diffstat:

 usr.sbin/pf/Makefile.inc     |   4 +-
 usr.sbin/pf/compat_openbsd.h |  60 --------------------------------------------
 2 files changed, 2 insertions(+), 62 deletions(-)

diffs (79 lines):

diff -r b9f38ed5145b -r bfb4cbabac13 usr.sbin/pf/Makefile.inc
--- a/usr.sbin/pf/Makefile.inc  Thu Jan 29 03:28:19 2015 +0000
+++ b/usr.sbin/pf/Makefile.inc  Thu Jan 29 03:31:35 2015 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile.inc,v 1.8 2011/05/26 12:56:34 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.9 2015/01/29 03:31:35 christos Exp $
 
 WARNS?=        1       # XXX -Wshadow -Wcast-qual -Wsign-compare
 CWARNFLAGS.clang+=     -Wno-tautological-compare
 
-CPPFLAGS+=     -include ${.CURDIR}/../compat_openbsd.h
+CPPFLAGS+= -D_OPENBSD_SOURCE
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"
diff -r b9f38ed5145b -r bfb4cbabac13 usr.sbin/pf/compat_openbsd.h
--- a/usr.sbin/pf/compat_openbsd.h      Thu Jan 29 03:28:19 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*     $NetBSD: compat_openbsd.h,v 1.6 2013/04/10 22:21:53 christos Exp $      */
-
-/*-
- * Copyright (c)2004 YAMAMOTO Takashi,
- * 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 AUTHOR 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 AUTHOR 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.
- */
-
-/*
- * misc OpenBSD compatibility hacks.
- */
-
-#include <sys/cdefs.h>
-
-#include <stdarg.h>
-
-/*
- * libc/stdlib/strtonum.c
- */
-
-#include <limits.h>
-#include <stdlib.h>
-
-static __inline long long
-strtonum(const char *, long long, long long, const char **) __unused;
-
-static __inline long long
-strtonum(const char *numstr, long long minval, long long maxval,
-    const char **errstrp)
-{
-       char *p;
-       long long n;
-
-       n = strtol(numstr, &p, 10);
-       if (*p != '\0' || *numstr == '\0') {
-               *errstrp = "invalid";
-               n = 0;
-       }
-       return (n);
-}