[src/trunk]: src/sbin/bioctl kill 1 copy of strtonum.

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

details:   https://anonhg.NetBSD.org/src/rev/a745234e1e47
branches:  trunk
changeset: 335600:a745234e1e47
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 16 20:12:28 2015 +0000

description:
kill 1 copy of strtonum.

diffstat:

 sbin/bioctl/Makefile   |   4 +-
 sbin/bioctl/bioctl.c   |   5 +--
 sbin/bioctl/strtonum.c |  72 --------------------------------------------------
 sbin/bioctl/strtonum.h |   4 --
 4 files changed, 4 insertions(+), 81 deletions(-)

diffs (123 lines):

diff -r a3652edf9b02 -r a745234e1e47 sbin/bioctl/Makefile
--- a/sbin/bioctl/Makefile      Fri Jan 16 20:10:26 2015 +0000
+++ b/sbin/bioctl/Makefile      Fri Jan 16 20:12:28 2015 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.4 2009/04/11 07:58:11 lukem Exp $
+#      $NetBSD: Makefile,v 1.5 2015/01/16 20:12:28 christos Exp $
 
 PROG=  bioctl
-SRCS=   bioctl.c strtonum.c
 MAN=   bioctl.8
+CPPFLAGS+=-D_OPENBSD_SOURCE
 
 .include <bsd.prog.mk>
diff -r a3652edf9b02 -r a745234e1e47 sbin/bioctl/bioctl.c
--- a/sbin/bioctl/bioctl.c      Fri Jan 16 20:10:26 2015 +0000
+++ b/sbin/bioctl/bioctl.c      Fri Jan 16 20:12:28 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bioctl.c,v 1.16 2014/11/15 01:52:01 joerg Exp $ */
+/* $NetBSD: bioctl.c,v 1.17 2015/01/16 20:12:28 christos Exp $ */
 /* $OpenBSD: bioctl.c,v 1.52 2007/03/20 15:26:06 jmc Exp $ */
 
 /*
@@ -31,7 +31,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: bioctl.c,v 1.16 2014/11/15 01:52:01 joerg Exp $");
+__RCSID("$NetBSD: bioctl.c,v 1.17 2015/01/16 20:12:28 christos Exp $");
 #endif
 
 #include <sys/types.h>
@@ -51,7 +51,6 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <util.h>
-#include "strtonum.h"
 
 struct command {
        const char *cmd_name;
diff -r a3652edf9b02 -r a745234e1e47 sbin/bioctl/strtonum.c
--- a/sbin/bioctl/strtonum.c    Fri Jan 16 20:10:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*     $NetBSD: strtonum.c,v 1.1 2007/05/01 17:18:54 bouyer Exp $ */
-/*     $OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $    */
-
-/*
- * Copyright (c) 2004 Ted Unangst and Todd Miller
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <sys/cdefs.h>
-
-#ifndef lint
-__RCSID("$NetBSD: strtonum.c,v 1.1 2007/05/01 17:18:54 bouyer Exp $");
-#endif
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include "strtonum.h"
-
-#define INVALID        1
-#define TOOSMALL       2
-#define TOOLARGE       3
-
-long long
-strtonum(const char *numstr, long long minval, long long maxval,
-    const char **errstrp)
-{
-       long long ll = 0;
-       char *ep;
-       int error = 0;
-       struct errval {
-               const char *errstr;
-               int err;
-       } ev[4] = {
-               { NULL,         0 },
-               { "invalid",    EINVAL },
-               { "too small",  ERANGE },
-               { "too large",  ERANGE },
-       };
-
-       ev[0].err = errno;
-       errno = 0;
-       if (minval > maxval)
-               error = INVALID;
-       else {
-               ll = strtoll(numstr, &ep, 10);
-               if (numstr == ep || *ep != '\0')
-                       error = INVALID;
-               else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
-                       error = TOOSMALL;
-               else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
-                       error = TOOLARGE;
-       }
-       if (errstrp != NULL)
-               *errstrp = ev[error].errstr;
-       errno = ev[error].err;
-       if (error)
-               ll = 0;
-
-       return (ll);
-}
diff -r a3652edf9b02 -r a745234e1e47 sbin/bioctl/strtonum.h
--- a/sbin/bioctl/strtonum.h    Fri Jan 16 20:10:26 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-/* $NetBSD: strtonum.h,v 1.1 2007/05/01 17:18:54 bouyer Exp $ */
-
-long long strtonum(const char *, long long, long long, const char **);
-