[src/netbsd-6]: src/usr.bin/nbperf Pull up revisions:

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

details:   https://anonhg.NetBSD.org/src/rev/0d0a8b5b8f6a
branches:  netbsd-6
changeset: 775691:0d0a8b5b8f6a
user:      jdc <jdc%NetBSD.org@localhost>
date:      Thu Feb 14 22:06:18 2013 +0000

description:
Pull up revisions:
  src/usr.bin/nbperf/nbperf-bdz.c revision 1.7
  src/usr.bin/nbperf/nbperf.1 revision 1.6
  src/usr.bin/nbperf/nbperf.c revision 1.5
  src/usr.bin/nbperf/nbperf.h revision 1.4
(requested by joerg in ticket #819).

bdz -> bpz to match the initials of the authors.

diffstat:

 usr.bin/nbperf/nbperf-bdz.c |   6 +++---
 usr.bin/nbperf/nbperf.1     |   4 ++--
 usr.bin/nbperf/nbperf.c     |  10 ++++++----
 usr.bin/nbperf/nbperf.h     |   4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diffs (95 lines):

diff -r 6ad02cf024ba -r 0d0a8b5b8f6a usr.bin/nbperf/nbperf-bdz.c
--- a/usr.bin/nbperf/nbperf-bdz.c       Thu Feb 14 21:50:41 2013 +0000
+++ b/usr.bin/nbperf/nbperf-bdz.c       Thu Feb 14 22:06:18 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nbperf-bdz.c,v 1.4.4.1 2012/10/17 21:37:11 riz Exp $   */
+/*     $NetBSD: nbperf-bdz.c,v 1.4.4.2 2013/02/14 22:06:18 jdc Exp $   */
 /*-
  * Copyright (c) 2009, 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: nbperf-bdz.c,v 1.4.4.1 2012/10/17 21:37:11 riz Exp $");
+__RCSID("$NetBSD: nbperf-bdz.c,v 1.4.4.2 2013/02/14 22:06:18 jdc Exp $");
 
 #include <err.h>
 #include <inttypes.h>
@@ -253,7 +253,7 @@
 }
 
 int
-bdz_compute(struct nbperf *nbperf)
+bpz_compute(struct nbperf *nbperf)
 {
        struct state state;
        int retval = -1;
diff -r 6ad02cf024ba -r 0d0a8b5b8f6a usr.bin/nbperf/nbperf.1
--- a/usr.bin/nbperf/nbperf.1   Thu Feb 14 21:50:41 2013 +0000
+++ b/usr.bin/nbperf/nbperf.1   Thu Feb 14 22:06:18 2013 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: nbperf.1,v 1.3.4.2 2012/10/17 21:37:11 riz Exp $
+.\"    $NetBSD: nbperf.1,v 1.3.4.3 2013/02/14 22:06:18 jdc Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -88,7 +88,7 @@
 .Ar chm3
 noticable smaller than the output for
 .Ar chm .
-.It Sy bdz
+.It Sy bpz
 This results in a non-order preserving minimal perfect hash function.
 Output size is approximately 2.79 bit per key for the default value of
 .Ar utilisation ,
diff -r 6ad02cf024ba -r 0d0a8b5b8f6a usr.bin/nbperf/nbperf.c
--- a/usr.bin/nbperf/nbperf.c   Thu Feb 14 21:50:41 2013 +0000
+++ b/usr.bin/nbperf/nbperf.c   Thu Feb 14 22:06:18 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nbperf.c,v 1.4 2011/10/21 23:47:11 joerg Exp $ */
+/*     $NetBSD: nbperf.c,v 1.4.4.1 2013/02/14 22:06:18 jdc Exp $       */
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: nbperf.c,v 1.4 2011/10/21 23:47:11 joerg Exp $");
+__RCSID("$NetBSD: nbperf.c,v 1.4.4.1 2013/02/14 22:06:18 jdc Exp $");
 
 #include <sys/endian.h>
 #include <err.h>
@@ -135,12 +135,14 @@
        while ((ch = getopt(argc, argv, "a:c:h:i:m:n:o:ps")) != -1) {
                switch (ch) {
                case 'a':
+                       /* Accept bdz as alias for netbsd-6 compat. */
                        if (strcmp(optarg, "chm") == 0)
                                build_hash = chm_compute;
                        else if (strcmp(optarg, "chm3") == 0)
                                build_hash = chm3_compute;
-                       else if (strcmp(optarg, "bdz") == 0)
-                               build_hash = bdz_compute;
+                       else if (strcmp(optarg, "bpz") == 0 ||
+                                strcmp(optarg, "bdz") == 0)
+                               build_hash = bpz_compute;
                        else
                                errx(1, "Unsupport algorithm: %s", optarg);
                        break;
diff -r 6ad02cf024ba -r 0d0a8b5b8f6a usr.bin/nbperf/nbperf.h
--- a/usr.bin/nbperf/nbperf.h   Thu Feb 14 21:50:41 2013 +0000
+++ b/usr.bin/nbperf/nbperf.h   Thu Feb 14 22:06:18 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nbperf.h,v 1.3 2010/03/03 01:55:04 joerg Exp $ */
+/*     $NetBSD: nbperf.h,v 1.3.8.1 2013/02/14 22:06:18 jdc Exp $       */
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -56,4 +56,4 @@
 
 int    chm_compute(struct nbperf *);
 int    chm3_compute(struct nbperf *);
-int    bdz_compute(struct nbperf *);
+int    bpz_compute(struct nbperf *);