Module Name: src
Committed By: roy
Date: Fri Feb 12 10:18:56 UTC 2010
Modified Files:
src/lib/libterminfo: hash.c termcap_hash.c termcap_map.c terminfo.5.in
Log Message:
Don't try to map obsolete termcap bc and nl to terminfo.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libterminfo/hash.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libterminfo/termcap_hash.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libterminfo/termcap_map.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libterminfo/terminfo.5.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libterminfo/hash.c
diff -u src/lib/libterminfo/hash.c:1.3 src/lib/libterminfo/hash.c:1.4
--- src/lib/libterminfo/hash.c:1.3 Thu Feb 4 12:25:08 2010
+++ src/lib/libterminfo/hash.c Fri Feb 12 10:18:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hash.c,v 1.3 2010/02/04 12:25:08 roy Exp $ */
+/* $NetBSD: hash.c,v 1.4 2010/02/12 10:18:56 roy Exp $ */
/* DO NOT EDIT
* Automatically generated from term.h */
@@ -7,7 +7,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hash.c,v 1.3 2010/02/04 12:25:08 roy Exp $");
+__RCSID("$NetBSD: hash.c,v 1.4 2010/02/12 10:18:56 roy Exp $");
#include <stdint.h>
#include <stdlib.h>
@@ -61,18 +61,18 @@
_ti_flaghash(const void * __restrict key, size_t keylen)
{
static const uint8_t g[75] = {
- 0x05, 0x09, 0x03, 0x12, 0x00, 0x04, 0x00, 0x18, 0x00, 0x00,
- 0x00, 0x08, 0x00, 0x00, 0x11, 0x24, 0x01, 0x00, 0x19, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00,
- 0x00, 0x01, 0x21, 0x09, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00,
- 0x1b, 0x16, 0x15, 0x0e, 0x0c, 0x0f, 0x00, 0x15, 0x0a, 0x22,
- 0x00, 0x24, 0x1f, 0x00, 0x00, 0x19, 0x00, 0x14, 0x00, 0x14,
- 0x05, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x0a, 0x02, 0x00,
- 0x00, 0x00, 0x00, 0x23, 0x00,
+ 0x19, 0x08, 0x16, 0x00, 0x00, 0x1e, 0x07, 0x00, 0x1d, 0x00,
+ 0x17, 0x00, 0x0a, 0x17, 0x08, 0x09, 0x11, 0x00, 0x00, 0x0a,
+ 0x00, 0x13, 0x1a, 0x0f, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00,
+ 0x12, 0x0a, 0x00, 0x11, 0x10, 0x09, 0x00, 0x00, 0x00, 0x1b,
+ 0x00, 0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0d, 0x00, 0x00,
+ 0x00, 0x0d, 0x00, 0x00, 0x04, 0x16, 0x09, 0x00, 0x1a, 0x00,
+ 0x00, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+ 0x00, 0x1c, 0x05, 0x00, 0x00,
};
uint32_t h[3];
- mi_vector_hash(key, keylen, 0xe0584cf3U, h);
+ mi_vector_hash(key, keylen, 0xd36b2625U, h);
return (g[h[0] % 75] + g[h[1] % 75]) % 37;
}
@@ -139,17 +139,17 @@
_ti_numhash(const void * __restrict key, size_t keylen)
{
static const uint8_t g[67] = {
- 0x1d, 0x00, 0x07, 0x09, 0x1c, 0x00, 0x0d, 0x15, 0x0f, 0x00,
- 0x00, 0x1c, 0x00, 0x11, 0x01, 0x03, 0x03, 0x00, 0x18, 0x06,
- 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x18, 0x00, 0x1e,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0x0a, 0x00, 0x00, 0x1a,
- 0x00, 0x00, 0x00, 0x0e, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x07, 0x0c, 0x00, 0x00, 0x12, 0x1f, 0x00, 0x00,
- 0x00, 0x00, 0x0b, 0x05, 0x09, 0x14, 0x0b,
+ 0x04, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00,
+ 0x19, 0x00, 0x0d, 0x00, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00,
+ 0x0b, 0x15, 0x1d, 0x14, 0x00, 0x01, 0x13, 0x1b, 0x14, 0x00,
+ 0x19, 0x00, 0x00, 0x02, 0x14, 0x1a, 0x12, 0x00, 0x00, 0x00,
+ 0x16, 0x05, 0x00, 0x12, 0x04, 0x00, 0x03, 0x00, 0x00, 0x00,
+ 0x19, 0x00, 0x20, 0x00, 0x00, 0x10, 0x17, 0x00, 0x00, 0x0f,
+ 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
};
uint32_t h[3];
- mi_vector_hash(key, keylen, 0x4bd7de7aU, h);
+ mi_vector_hash(key, keylen, 0x50a11f58U, h);
return (g[h[0] % 67] + g[h[1] % 67]) % 33;
}
@@ -577,109 +577,109 @@
_ti_strhash(const void * __restrict key, size_t keylen)
{
static const uint16_t g[789] = {
- 0x0000, 0x0000, 0x0000, 0x007f, 0x000c, 0x0026, 0x00d7, 0x0000,
- 0x000e, 0x0000, 0x00dc, 0x0000, 0x0000, 0x0153, 0x0000, 0x0000,
- 0x0003, 0x0000, 0x0180, 0x00bd, 0x0066, 0x0067, 0x000a, 0x00a4,
- 0x0036, 0x00b8, 0x0000, 0x00a6, 0x0000, 0x0186, 0x000d, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x00e2, 0x0000, 0x0088, 0x00bc, 0x0075,
- 0x0000, 0x007e, 0x00ef, 0x0000, 0x0000, 0x0000, 0x00fe, 0x0159,
- 0x0093, 0x0000, 0x0074, 0x0000, 0x003d, 0x0000, 0x0000, 0x0000,
- 0x00f6, 0x0000, 0x0117, 0x0000, 0x0022, 0x0000, 0x00a1, 0x0000,
- 0x0000, 0x0000, 0x000a, 0x0000, 0x00ed, 0x012c, 0x014d, 0x005a,
- 0x016a, 0x0102, 0x0000, 0x0000, 0x012d, 0x0066, 0x005a, 0x0000,
- 0x0000, 0x0000, 0x00e5, 0x010f, 0x010b, 0x006d, 0x0000, 0x00f3,
- 0x0000, 0x0131, 0x012e, 0x0176, 0x0000, 0x0000, 0x0096, 0x0000,
- 0x00de, 0x0000, 0x00bb, 0x001e, 0x0000, 0x010e, 0x0000, 0x0000,
- 0x010c, 0x004c, 0x002e, 0x0000, 0x00cb, 0x0165, 0x0180, 0x00e1,
- 0x0013, 0x001d, 0x0000, 0x0000, 0x0000, 0x0000, 0x001a, 0x00d2,
- 0x007b, 0x0043, 0x0091, 0x00f2, 0x0000, 0x0000, 0x016f, 0x00a0,
- 0x000f, 0x0000, 0x017e, 0x006d, 0x0001, 0x00d6, 0x0000, 0x0087,
- 0x0000, 0x0000, 0x0120, 0x015d, 0x0000, 0x0000, 0x00cf, 0x0000,
- 0x00aa, 0x0000, 0x003e, 0x0084, 0x00ca, 0x00bb, 0x0000, 0x0138,
- 0x005c, 0x0000, 0x009c, 0x0000, 0x0000, 0x0000, 0x013e, 0x0000,
- 0x0000, 0x0000, 0x0011, 0x00a5, 0x00de, 0x00b4, 0x012f, 0x0000,
- 0x0000, 0x0011, 0x0000, 0x0000, 0x007a, 0x009e, 0x0000, 0x0083,
- 0x003d, 0x00a0, 0x0000, 0x011b, 0x0000, 0x0000, 0x00d8, 0x0000,
- 0x0000, 0x00e1, 0x001c, 0x0153, 0x010b, 0x0000, 0x0081, 0x0020,
- 0x0000, 0x00ef, 0x0000, 0x0000, 0x00cc, 0x0068, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x00eb, 0x0000, 0x0000, 0x0000, 0x0061, 0x0052,
- 0x0000, 0x0000, 0x008a, 0x0016, 0x00f4, 0x00ed, 0x013d, 0x0143,
- 0x0000, 0x00f2, 0x0000, 0x0000, 0x002c, 0x0189, 0x0115, 0x0000,
- 0x007c, 0x00b0, 0x00fc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x00dc, 0x0000, 0x0025, 0x0000, 0x0162, 0x0000, 0x010b, 0x0000,
- 0x0138, 0x0000, 0x0114, 0x017c, 0x0160, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0178, 0x00a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x017f, 0x0051, 0x0184,
- 0x00c9, 0x00d7, 0x0000, 0x0000, 0x0000, 0x00e7, 0x00db, 0x0056,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x00ac, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d5, 0x0000,
- 0x0000, 0x0000, 0x00ae, 0x0048, 0x00bf, 0x0000, 0x0000, 0x0013,
- 0x010e, 0x0000, 0x0000, 0x0061, 0x0000, 0x0000, 0x0152, 0x0000,
- 0x0000, 0x0007, 0x013b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0157,
- 0x0000, 0x0000, 0x003d, 0x0000, 0x0000, 0x0000, 0x0114, 0x0037,
- 0x0000, 0x0000, 0x0058, 0x0000, 0x0000, 0x0065, 0x015b, 0x00af,
- 0x0000, 0x00bd, 0x0081, 0x015e, 0x0132, 0x0000, 0x0000, 0x011b,
- 0x004e, 0x0000, 0x006f, 0x0000, 0x0000, 0x0000, 0x0147, 0x0059,
- 0x014c, 0x0116, 0x0000, 0x0000, 0x0142, 0x0016, 0x0000, 0x00bd,
- 0x0167, 0x0000, 0x0011, 0x0000, 0x0000, 0x0000, 0x000e, 0x008d,
- 0x0000, 0x0000, 0x012b, 0x00c9, 0x0000, 0x010f, 0x0000, 0x0000,
- 0x0000, 0x0099, 0x0082, 0x0000, 0x0034, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0023, 0x0035, 0x0171, 0x0133,
- 0x0000, 0x007f, 0x0000, 0x0000, 0x0000, 0x0189, 0x00c7, 0x00ec,
- 0x0000, 0x002d, 0x0098, 0x0000, 0x0047, 0x0000, 0x00a7, 0x0160,
- 0x0188, 0x0000, 0x0166, 0x00b6, 0x0000, 0x0000, 0x004a, 0x0000,
- 0x00e4, 0x0000, 0x00c7, 0x008f, 0x009d, 0x014d, 0x0071, 0x0140,
- 0x00f8, 0x00ab, 0x0054, 0x0013, 0x0109, 0x004d, 0x0000, 0x00f0,
- 0x013e, 0x016f, 0x0000, 0x0000, 0x00a7, 0x0000, 0x011b, 0x005c,
- 0x00c0, 0x011b, 0x0175, 0x0000, 0x0000, 0x00f7, 0x00be, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x00b3, 0x00dc, 0x0033, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x010d, 0x0113, 0x0000, 0x00aa, 0x002e,
- 0x0042, 0x0070, 0x00a6, 0x0000, 0x0000, 0x0000, 0x012e, 0x0000,
- 0x0000, 0x0000, 0x009c, 0x0084, 0x003c, 0x001b, 0x00db, 0x005d,
- 0x0172, 0x0000, 0x0000, 0x0138, 0x0000, 0x00eb, 0x0000, 0x0162,
- 0x0000, 0x0000, 0x0091, 0x0169, 0x0141, 0x0000, 0x005c, 0x0121,
- 0x0000, 0x0000, 0x0146, 0x0000, 0x0000, 0x0043, 0x0000, 0x0000,
- 0x00c6, 0x0000, 0x0000, 0x0000, 0x0000, 0x009d, 0x0165, 0x00d6,
- 0x0139, 0x0000, 0x0000, 0x0007, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0154, 0x00e5, 0x00a8, 0x0000, 0x0000, 0x008e, 0x0174, 0x0156,
- 0x0000, 0x014c, 0x0000, 0x017d, 0x017e, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x0000, 0x016d, 0x0000,
- 0x0000, 0x0000, 0x0103, 0x0000, 0x0000, 0x0000, 0x0143, 0x0000,
- 0x0000, 0x0040, 0x0000, 0x013a, 0x002e, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0085, 0x0000, 0x0000, 0x00b7, 0x0000, 0x0058, 0x00f5,
- 0x0055, 0x0000, 0x0000, 0x0028, 0x0000, 0x0000, 0x0126, 0x0029,
- 0x0000, 0x013f, 0x0000, 0x0117, 0x0000, 0x0000, 0x0000, 0x0129,
- 0x0019, 0x0120, 0x0000, 0x00a4, 0x0009, 0x0000, 0x00cf, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0096, 0x0000, 0x0098, 0x0000, 0x00a7,
- 0x0088, 0x0000, 0x013a, 0x0000, 0x0000, 0x002c, 0x00cc, 0x0000,
- 0x007e, 0x0000, 0x0000, 0x014f, 0x0000, 0x0066, 0x0092, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x015e,
- 0x0153, 0x0000, 0x0000, 0x0095, 0x0000, 0x00ac, 0x013b, 0x0000,
- 0x00fa, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x009b, 0x0000,
- 0x0000, 0x0160, 0x0099, 0x0000, 0x0177, 0x0000, 0x00fe, 0x0000,
- 0x0000, 0x00e3, 0x011b, 0x0046, 0x0000, 0x0000, 0x0000, 0x012a,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0030, 0x011f, 0x00e6, 0x0000, 0x00b5, 0x0063, 0x0000, 0x012a,
- 0x0000, 0x0000, 0x0183, 0x0000, 0x0000, 0x006a, 0x00c4, 0x0000,
- 0x0000, 0x0131, 0x0000, 0x0000, 0x0008, 0x0000, 0x0000, 0x005d,
- 0x0006, 0x0022, 0x0000, 0x003e, 0x0000, 0x0147, 0x0000, 0x0000,
- 0x0000, 0x002b, 0x0060, 0x0066, 0x0000, 0x0000, 0x000c, 0x00d0,
- 0x00c5, 0x0042, 0x0000, 0x0000, 0x0000, 0x00e8, 0x0188, 0x00eb,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x00a6, 0x00ae, 0x0000, 0x0147,
- 0x0000, 0x0000, 0x0000, 0x012d, 0x0000, 0x0000, 0x0084, 0x0033,
- 0x00fc, 0x0000, 0x00a1, 0x0008, 0x0180, 0x00e4, 0x0000, 0x00fd,
- 0x00df, 0x00ad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0017, 0x0160,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x015e, 0x0000, 0x0097, 0x0000,
- 0x012b, 0x015c, 0x0005, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x00cd, 0x0014, 0x002f, 0x0048, 0x00c4, 0x010a, 0x0051,
- 0x017c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0113,
- 0x0168, 0x004a, 0x002d, 0x00e6, 0x0066, 0x00d9, 0x0134, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0064, 0x013f,
- 0x00b0, 0x0000, 0x00d8, 0x00b6, 0x0000,
+ 0x0000, 0x00cd, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0094,
+ 0x0000, 0x011b, 0x00a0, 0x0094, 0x002f, 0x00aa, 0x0026, 0x004b,
+ 0x0000, 0x0163, 0x0171, 0x0000, 0x0000, 0x0064, 0x0019, 0x0000,
+ 0x009b, 0x0113, 0x00ed, 0x007e, 0x0000, 0x0000, 0x0000, 0x002d,
+ 0x0000, 0x00f4, 0x0000, 0x00cc, 0x00df, 0x0170, 0x0000, 0x0000,
+ 0x0179, 0x0018, 0x0000, 0x013b, 0x0000, 0x0028, 0x0000, 0x0000,
+ 0x00ef, 0x0000, 0x0137, 0x0061, 0x0000, 0x0000, 0x00ce, 0x00df,
+ 0x00f0, 0x001f, 0x0074, 0x0000, 0x0000, 0x008f, 0x0069, 0x0000,
+ 0x0134, 0x0000, 0x00ac, 0x0000, 0x0000, 0x0100, 0x0000, 0x0000,
+ 0x0012, 0x0027, 0x0000, 0x0110, 0x0000, 0x0000, 0x0000, 0x0061,
+ 0x00a7, 0x0000, 0x0061, 0x0000, 0x0000, 0x0096, 0x0000, 0x00e5,
+ 0x0000, 0x00d1, 0x0017, 0x0000, 0x0000, 0x00bc, 0x00d6, 0x0000,
+ 0x0182, 0x00d7, 0x012d, 0x0000, 0x00e2, 0x00b9, 0x0159, 0x0000,
+ 0x001c, 0x00cc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0031, 0x0106, 0x0087, 0x0157, 0x001d, 0x011a, 0x0119,
+ 0x0000, 0x0000, 0x0000, 0x012b, 0x0000, 0x011b, 0x0000, 0x0154,
+ 0x0000, 0x00ee, 0x00ad, 0x00f8, 0x0066, 0x0000, 0x0010, 0x0000,
+ 0x0064, 0x000e, 0x0052, 0x0000, 0x016a, 0x0000, 0x0148, 0x0000,
+ 0x0000, 0x0000, 0x00a4, 0x0000, 0x0000, 0x016d, 0x000b, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0058, 0x0091, 0x0000, 0x0022, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0026, 0x011a, 0x00a4, 0x013a,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0086, 0x0000, 0x00c0, 0x011f,
+ 0x0000, 0x0093, 0x0000, 0x0000, 0x0042, 0x0174, 0x0101, 0x0000,
+ 0x0065, 0x0086, 0x0000, 0x0000, 0x00e8, 0x0022, 0x000d, 0x0000,
+ 0x008e, 0x000d, 0x0000, 0x008b, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0022, 0x0000, 0x011d, 0x0000, 0x0000, 0x0000, 0x010e, 0x0000,
+ 0x0000, 0x0000, 0x0060, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0014, 0x00b3, 0x0000, 0x002e, 0x0051, 0x0000, 0x0102, 0x008e,
+ 0x012b, 0x0145, 0x004c, 0x0000, 0x001e, 0x00fa, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x00aa, 0x0000, 0x0000, 0x0000, 0x0103, 0x00a4,
+ 0x003e, 0x0000, 0x0114, 0x0028, 0x005e, 0x015d, 0x00e7, 0x0044,
+ 0x0000, 0x0000, 0x00c6, 0x008f, 0x0000, 0x00eb, 0x0000, 0x0000,
+ 0x0000, 0x0169, 0x0000, 0x0110, 0x0093, 0x0000, 0x012c, 0x0178,
+ 0x0000, 0x0000, 0x0024, 0x0000, 0x0000, 0x0000, 0x0000, 0x0158,
+ 0x004d, 0x009c, 0x0186, 0x009b, 0x0000, 0x0163, 0x007c, 0x0078,
+ 0x0000, 0x0000, 0x0172, 0x00d2, 0x0000, 0x0000, 0x00fc, 0x0000,
+ 0x0000, 0x0000, 0x0133, 0x0104, 0x017e, 0x0162, 0x0050, 0x0000,
+ 0x0023, 0x00c0, 0x0070, 0x0000, 0x0000, 0x0000, 0x0025, 0x0001,
+ 0x0184, 0x0053, 0x0133, 0x0000, 0x0000, 0x0000, 0x0048, 0x0075,
+ 0x0000, 0x00b2, 0x0056, 0x002c, 0x0000, 0x011c, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0166, 0x011b, 0x0000, 0x0039, 0x0020,
+ 0x0000, 0x0000, 0x0000, 0x00dc, 0x0048, 0x0000, 0x0076, 0x0169,
+ 0x00d7, 0x002a, 0x0032, 0x0013, 0x0153, 0x012f, 0x009c, 0x0041,
+ 0x002f, 0x0000, 0x0000, 0x012e, 0x0000, 0x0000, 0x00dd, 0x0000,
+ 0x0138, 0x000b, 0x0030, 0x008d, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0039, 0x017a, 0x00c5, 0x0100, 0x0000, 0x0000, 0x005c, 0x001f,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0110, 0x003e, 0x00a1, 0x0000,
+ 0x0081, 0x0000, 0x0000, 0x0000, 0x00dd, 0x0142, 0x00c1, 0x0000,
+ 0x0035, 0x0123, 0x0178, 0x00be, 0x015e, 0x0161, 0x0188, 0x0000,
+ 0x0000, 0x0149, 0x0123, 0x0000, 0x0000, 0x0185, 0x0000, 0x0000,
+ 0x0000, 0x004e, 0x0163, 0x0077, 0x00fa, 0x0000, 0x007b, 0x0006,
+ 0x0101, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0158, 0x00d6,
+ 0x00b0, 0x0180, 0x0003, 0x0000, 0x0000, 0x0000, 0x0136, 0x0045,
+ 0x017e, 0x0000, 0x0000, 0x0000, 0x0126, 0x0090, 0x011b, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x017b, 0x0000, 0x0053, 0x0000,
+ 0x005c, 0x0000, 0x0000, 0x0020, 0x0000, 0x0000, 0x007e, 0x014e,
+ 0x0035, 0x00ed, 0x0000, 0x00d1, 0x00d8, 0x0142, 0x0168, 0x000a,
+ 0x00d0, 0x0000, 0x0000, 0x0000, 0x00d9, 0x0000, 0x0000, 0x0087,
+ 0x0000, 0x008a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0112, 0x006c,
+ 0x011d, 0x0177, 0x0000, 0x0000, 0x0000, 0x0000, 0x0024, 0x001e,
+ 0x0177, 0x00c4, 0x0000, 0x0000, 0x0000, 0x0014, 0x00c7, 0x00ae,
+ 0x0042, 0x0180, 0x0075, 0x0000, 0x011c, 0x0064, 0x00a3, 0x00bc,
+ 0x0001, 0x0000, 0x0000, 0x0016, 0x00c3, 0x00e4, 0x0009, 0x0000,
+ 0x0000, 0x006b, 0x013c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x00fa, 0x0000, 0x0000, 0x0000, 0x0117, 0x0000, 0x007c, 0x0060,
+ 0x0149, 0x0059, 0x00d4, 0x014e, 0x000a, 0x014f, 0x0000, 0x0000,
+ 0x0000, 0x00b6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121,
+ 0x0000, 0x0000, 0x0000, 0x007d, 0x0000, 0x0000, 0x001c, 0x0000,
+ 0x0000, 0x00f9, 0x0000, 0x003b, 0x00ea, 0x0000, 0x00ad, 0x0000,
+ 0x0000, 0x0000, 0x0155, 0x0000, 0x0141, 0x0000, 0x0000, 0x0000,
+ 0x0187, 0x004b, 0x009f, 0x0000, 0x0114, 0x0000, 0x00dd, 0x0000,
+ 0x0066, 0x0000, 0x0136, 0x0135, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x001e, 0x0000, 0x0062, 0x0146, 0x0033, 0x0071, 0x0000,
+ 0x0000, 0x010d, 0x004a, 0x0133, 0x0000, 0x0000, 0x0076, 0x0111,
+ 0x0000, 0x00ba, 0x0000, 0x0000, 0x0000, 0x0038, 0x001d, 0x0158,
+ 0x0072, 0x00a3, 0x0000, 0x008c, 0x0008, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0001, 0x0000, 0x0000, 0x0000, 0x00ea, 0x0000, 0x003f,
+ 0x0000, 0x0000, 0x0000, 0x004c, 0x0000, 0x00f9, 0x0000, 0x0000,
+ 0x0000, 0x0147, 0x0182, 0x008f, 0x0156, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0011, 0x0000, 0x0102, 0x0040, 0x0000, 0x0000,
+ 0x0130, 0x0000, 0x0000, 0x0000, 0x0126, 0x0026, 0x0145, 0x0000,
+ 0x0000, 0x00ab, 0x0000, 0x0175, 0x0113, 0x0117, 0x010f, 0x000f,
+ 0x0000, 0x00e3, 0x012e, 0x0000, 0x0000, 0x00f5, 0x0020, 0x0000,
+ 0x0000, 0x00a8, 0x0000, 0x0000, 0x012a, 0x009f, 0x0085, 0x0000,
+ 0x00b6, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0108,
+ 0x00cb, 0x0000, 0x0000, 0x0000, 0x0053, 0x0000, 0x007f, 0x0000,
+ 0x008c, 0x0113, 0x0000, 0x0000, 0x0156, 0x0169, 0x0000, 0x0009,
+ 0x0000, 0x0073, 0x0000, 0x007e, 0x0000, 0x0000, 0x0000, 0x00eb,
+ 0x0000, 0x0153, 0x0084, 0x0000, 0x0000, 0x0148, 0x0000, 0x0000,
+ 0x011c, 0x0000, 0x00ec, 0x0000, 0x0000, 0x015a, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x012a, 0x0000, 0x0000, 0x015d, 0x0000, 0x00ae,
+ 0x0000, 0x0000, 0x00db, 0x0000, 0x0000, 0x0000, 0x0000, 0x0101,
+ 0x0067, 0x0000, 0x010c, 0x0000, 0x0032, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0167, 0x0000, 0x00e4, 0x0000, 0x00a2, 0x0000,
+ 0x0067, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0181, 0x0000,
+ 0x015b, 0x0046, 0x0000, 0x0000, 0x0000, 0x00fd, 0x0000, 0x0000,
+ 0x00a8, 0x0000, 0x0008, 0x00a6, 0x00b5, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x006b, 0x0000, 0x0000, 0x00b1, 0x00a2,
+ 0x0000, 0x0000, 0x0000, 0x0166, 0x0000,
};
uint32_t h[3];
- mi_vector_hash(key, keylen, 0xec8e9cf6U, h);
+ mi_vector_hash(key, keylen, 0x8e1051e9U, h);
return (g[h[0] % 789] + g[h[1] % 789]) % 394;
}
Index: src/lib/libterminfo/termcap_hash.c
diff -u src/lib/libterminfo/termcap_hash.c:1.2 src/lib/libterminfo/termcap_hash.c:1.3
--- src/lib/libterminfo/termcap_hash.c:1.2 Thu Feb 4 09:46:26 2010
+++ src/lib/libterminfo/termcap_hash.c Fri Feb 12 10:18:56 2010
@@ -1,9 +1,9 @@
-/* $NetBSD: termcap_hash.c,v 1.2 2010/02/04 09:46:26 roy Exp $ */
+/* $NetBSD: termcap_hash.c,v 1.3 2010/02/12 10:18:56 roy Exp $ */
/* DO NOT EDIT
* Automatically generated from termcap.c */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: termcap_hash.c,v 1.2 2010/02/04 09:46:26 roy Exp $");
+__RCSID("$NetBSD: termcap_hash.c,v 1.3 2010/02/12 10:18:56 roy Exp $");
#include <stdint.h>
#include <stdlib.h>
@@ -15,18 +15,18 @@
_t_flaghash(const void * __restrict key, size_t keylen)
{
static const uint8_t g[75] = {
- 0x00, 0x00, 0x00, 0x23, 0x00, 0x1b, 0x0f, 0x00, 0x00, 0x24,
- 0x00, 0x16, 0x00, 0x16, 0x09, 0x00, 0x12, 0x12, 0x1a, 0x05,
- 0x00, 0x00, 0x09, 0x00, 0x21, 0x00, 0x24, 0x0c, 0x00, 0x00,
- 0x00, 0x00, 0x01, 0x00, 0x22, 0x00, 0x04, 0x06, 0x00, 0x18,
- 0x13, 0x00, 0x10, 0x00, 0x20, 0x00, 0x00, 0x1f, 0x1c, 0x00,
- 0x05, 0x0c, 0x12, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00,
- 0x06, 0x00, 0x00, 0x02, 0x02, 0x00, 0x03, 0x00, 0x0a, 0x11,
- 0x20, 0x00, 0x0d, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x08, 0x00, 0x00, 0x19,
+ 0x24, 0x0a, 0x00, 0x14, 0x20, 0x1d, 0x0e, 0x0d, 0x00, 0x0d,
+ 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x1a, 0x00,
+ 0x12, 0x00, 0x16, 0x00, 0x1d, 0x00, 0x00, 0x11, 0x00, 0x00,
+ 0x00, 0x17, 0x0e, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x10, 0x00,
+ 0x00, 0x1f, 0x02, 0x00, 0x00, 0x00, 0x0c, 0x13, 0x00, 0x23,
+ 0x00, 0x1f, 0x00, 0x00, 0x05, 0x00, 0x00, 0x15, 0x1d, 0x00,
+ 0x09, 0x00, 0x0f, 0x1b, 0x01,
};
uint32_t h[3];
- mi_vector_hash(key, keylen, 0xde3fd8a0U, h);
+ mi_vector_hash(key, keylen, 0x5a53bb7cU, h);
return (g[h[0] % 75] + g[h[1] % 75]) % 37;
}
@@ -36,17 +36,17 @@
_t_numhash(const void * __restrict key, size_t keylen)
{
static const uint8_t g[67] = {
- 0x00, 0x1b, 0x1f, 0x02, 0x00, 0x11, 0x0f, 0x00, 0x17, 0x03,
- 0x0b, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x00, 0x1d, 0x00,
- 0x04, 0x19, 0x07, 0x05, 0x00, 0x16, 0x10, 0x00, 0x00, 0x00,
- 0x08, 0x00, 0x15, 0x00, 0x00, 0x03, 0x14, 0x1c, 0x12, 0x00,
- 0x00, 0x00, 0x0a, 0x00, 0x00, 0x16, 0x1f, 0x0e, 0x00, 0x07,
- 0x0f, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00,
- 0x01, 0x00, 0x00, 0x00, 0x0e, 0x11, 0x00,
+ 0x03, 0x0e, 0x17, 0x01, 0x10, 0x00, 0x00, 0x00, 0x1e, 0x00,
+ 0x10, 0x00, 0x05, 0x13, 0x00, 0x00, 0x17, 0x00, 0x06, 0x18,
+ 0x03, 0x00, 0x00, 0x09, 0x18, 0x00, 0x07, 0x00, 0x00, 0x0c,
+ 0x14, 0x03, 0x01, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
+ 0x00, 0x1e, 0x00, 0x1d, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04,
+ 0x17, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x15, 0x0e, 0x0e,
+ 0x00, 0x0e, 0x00, 0x00, 0x00, 0x12, 0x00,
};
uint32_t h[3];
- mi_vector_hash(key, keylen, 0x32181169U, h);
+ mi_vector_hash(key, keylen, 0x6452f8e6U, h);
return (g[h[0] % 67] + g[h[1] % 67]) % 33;
}
@@ -55,110 +55,109 @@
static uint32_t
_t_strhash(const void * __restrict key, size_t keylen)
{
- static const uint16_t g[793] = {
- 0x008f, 0x0000, 0x0179, 0x0051, 0x015e, 0x0000, 0x0000, 0x0037,
- 0x0000, 0x0000, 0x0115, 0x00b1, 0x015f, 0x00d8, 0x0000, 0x00ef,
- 0x0004, 0x0000, 0x0000, 0x0000, 0x0025, 0x00e2, 0x0000, 0x0000,
- 0x0000, 0x012a, 0x0000, 0x0000, 0x0000, 0x0128, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x00b8, 0x0185, 0x0182, 0x000d, 0x0000, 0x0000,
- 0x0000, 0x004b, 0x0000, 0x002a, 0x0000, 0x009c, 0x005d, 0x0000,
- 0x0000, 0x00b3, 0x00e4, 0x0000, 0x0000, 0x0014, 0x0119, 0x0144,
- 0x0173, 0x0000, 0x017b, 0x001d, 0x0000, 0x00dd, 0x00f3, 0x0000,
- 0x0071, 0x0158, 0x0033, 0x0000, 0x0000, 0x0000, 0x0000, 0x007f,
- 0x0140, 0x009f, 0x0000, 0x0000, 0x00ae, 0x0015, 0x0000, 0x0109,
- 0x0000, 0x00f2, 0x0000, 0x0000, 0x016d, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x016c, 0x001c, 0x0000, 0x0000, 0x0000, 0x00b1,
- 0x0000, 0x0000, 0x00d4, 0x0000, 0x0000, 0x0069, 0x015b, 0x009b,
- 0x0000, 0x0000, 0x00b3, 0x0010, 0x00a0, 0x0000, 0x000e, 0x0000,
- 0x0083, 0x0000, 0x011e, 0x0148, 0x0163, 0x0000, 0x0000, 0x00a7,
- 0x0000, 0x0072, 0x0000, 0x00ea, 0x002e, 0x0111, 0x003e, 0x0000,
- 0x0000, 0x00df, 0x00ad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0107,
- 0x0000, 0x0134, 0x0000, 0x013b, 0x0000, 0x0143, 0x00bd, 0x0000,
- 0x0186, 0x013a, 0x0000, 0x0000, 0x0000, 0x010f, 0x0000, 0x006a,
- 0x0000, 0x0187, 0x017a, 0x0000, 0x0000, 0x0065, 0x0000, 0x0095,
- 0x0000, 0x00a4, 0x002b, 0x00c6, 0x0000, 0x0095, 0x0000, 0x00cd,
- 0x00d6, 0x006d, 0x00e6, 0x0000, 0x00cb, 0x00b9, 0x00dc, 0x0062,
- 0x0000, 0x0000, 0x007e, 0x00df, 0x0000, 0x0020, 0x005f, 0x0000,
- 0x0000, 0x0000, 0x00df, 0x0051, 0x00cd, 0x00ad, 0x009a, 0x0000,
- 0x0000, 0x0000, 0x003f, 0x0000, 0x00ab, 0x0000, 0x0121, 0x0017,
- 0x0000, 0x0000, 0x0095, 0x0169, 0x0036, 0x0000, 0x001f, 0x0000,
- 0x0000, 0x0154, 0x00ab, 0x003d, 0x0110, 0x0000, 0x0108, 0x0000,
- 0x0000, 0x0000, 0x0156, 0x0000, 0x00e7, 0x0000, 0x000b, 0x0158,
- 0x0031, 0x0027, 0x0000, 0x0141, 0x0073, 0x00fa, 0x0170, 0x017c,
- 0x0000, 0x0000, 0x0000, 0x00d1, 0x0143, 0x0104, 0x00d9, 0x0000,
- 0x0000, 0x0000, 0x00cf, 0x0000, 0x0115, 0x0033, 0x0000, 0x0142,
- 0x0000, 0x0000, 0x00e2, 0x0044, 0x015c, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0100, 0x0080, 0x0000, 0x0000, 0x0017, 0x0000, 0x0029,
- 0x0000, 0x018b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0115,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0184, 0x0000, 0x0000, 0x0128,
- 0x0000, 0x0000, 0x0019, 0x00d2, 0x0000, 0x006c, 0x015a, 0x0000,
- 0x0149, 0x0000, 0x0122, 0x0000, 0x0173, 0x0000, 0x0000, 0x0090,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0083, 0x0000, 0x0009, 0x0000,
- 0x0022, 0x000f, 0x008c, 0x0000, 0x004f, 0x016d, 0x012c, 0x0000,
- 0x0140, 0x0000, 0x0000, 0x00bd, 0x00b6, 0x00b8, 0x00d0, 0x0000,
- 0x002c, 0x0001, 0x0000, 0x009c, 0x0000, 0x0124, 0x012a, 0x0000,
- 0x00e1, 0x0142, 0x0000, 0x0079, 0x0000, 0x00c6, 0x009d, 0x0023,
- 0x0000, 0x0094, 0x0000, 0x0113, 0x0000, 0x0000, 0x0061, 0x0141,
- 0x0000, 0x0000, 0x0074, 0x0000, 0x00e8, 0x0000, 0x0000, 0x015c,
- 0x0000, 0x0000, 0x0021, 0x0000, 0x0009, 0x0000, 0x0163, 0x0075,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0000, 0x011b, 0x0000,
- 0x00a5, 0x002c, 0x0000, 0x0100, 0x00e9, 0x0000, 0x0045, 0x0000,
- 0x0108, 0x0000, 0x0131, 0x0000, 0x0000, 0x0000, 0x0136, 0x0000,
- 0x0187, 0x00aa, 0x0000, 0x0000, 0x00aa, 0x0000, 0x006e, 0x012a,
- 0x0180, 0x0070, 0x0000, 0x0000, 0x0000, 0x0049, 0x0000, 0x0000,
- 0x0066, 0x0000, 0x0033, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x00c9, 0x0000, 0x0095, 0x0141, 0x00bf, 0x016a, 0x011a,
- 0x006b, 0x0166, 0x003b, 0x00c2, 0x00d3, 0x00ed, 0x0005, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0034, 0x0000, 0x0000, 0x0000,
- 0x0004, 0x0000, 0x0000, 0x0119, 0x0122, 0x0000, 0x0000, 0x0000,
- 0x0041, 0x0000, 0x015e, 0x0000, 0x0000, 0x0000, 0x0000, 0x015d,
- 0x0000, 0x0000, 0x00db, 0x0014, 0x017f, 0x0000, 0x017e, 0x0000,
- 0x008d, 0x0000, 0x0000, 0x0133, 0x00c3, 0x0000, 0x004c, 0x007b,
- 0x0000, 0x0000, 0x0057, 0x0000, 0x007c, 0x0078, 0x011e, 0x0000,
- 0x0000, 0x0000, 0x004d, 0x0000, 0x00b7, 0x00fc, 0x002a, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x011d, 0x0000, 0x0000,
- 0x0000, 0x0030, 0x0023, 0x0000, 0x0000, 0x0000, 0x005c, 0x0000,
- 0x0125, 0x0000, 0x0000, 0x001b, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0098, 0x0050, 0x0000, 0x00c2, 0x0000, 0x0000, 0x0000, 0x00bc,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00f4, 0x008a, 0x018a,
- 0x00e9, 0x0093, 0x0008, 0x0136, 0x0085, 0x0089, 0x0000, 0x0000,
- 0x0166, 0x0000, 0x0163, 0x0000, 0x0000, 0x0000, 0x0035, 0x0000,
- 0x0158, 0x010b, 0x0000, 0x012e, 0x0005, 0x0108, 0x00fd, 0x00d8,
- 0x0000, 0x0055, 0x0000, 0x0000, 0x0000, 0x00ff, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0094, 0x0034, 0x010a, 0x00a5, 0x00d9,
- 0x0000, 0x0084, 0x0161, 0x0067, 0x0087, 0x0000, 0x0000, 0x0012,
- 0x0106, 0x0000, 0x0000, 0x0000, 0x00b0, 0x004d, 0x0000, 0x0000,
- 0x00fb, 0x0001, 0x0144, 0x0000, 0x011f, 0x0016, 0x0000, 0x0000,
- 0x001e, 0x00e5, 0x005b, 0x00f4, 0x0021, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0155, 0x0178, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x00d9, 0x0000, 0x0000, 0x0000, 0x00e3, 0x0000,
- 0x0000, 0x00e9, 0x0000, 0x016d, 0x00df, 0x0060, 0x0000, 0x011e,
- 0x0000, 0x0000, 0x00fe, 0x0000, 0x0062, 0x0000, 0x0000, 0x0010,
- 0x0000, 0x0000, 0x0000, 0x0106, 0x0078, 0x00bb, 0x0000, 0x0047,
- 0x0060, 0x00f1, 0x0049, 0x0000, 0x0023, 0x0000, 0x0169, 0x00a0,
- 0x0000, 0x00d8, 0x0000, 0x006b, 0x0000, 0x0000, 0x0001, 0x0153,
- 0x0000, 0x0000, 0x0130, 0x0000, 0x002d, 0x00ee, 0x0000, 0x0003,
- 0x0000, 0x00c7, 0x00dd, 0x0000, 0x0000, 0x0000, 0x0077, 0x008e,
- 0x00b1, 0x0108, 0x0000, 0x0116, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0048, 0x0000, 0x0000,
- 0x0019, 0x00ca, 0x0116, 0x0121, 0x0000, 0x003a, 0x007f, 0x0050,
- 0x0000, 0x0012, 0x0000, 0x0157, 0x00d2, 0x0000, 0x010b, 0x0000,
- 0x0000, 0x0000, 0x0014, 0x007a, 0x0000, 0x0000, 0x0000, 0x0000,
- 0x0188, 0x00fd, 0x016e, 0x0178, 0x0000, 0x0062, 0x0000, 0x0174,
- 0x0000, 0x0038, 0x0000, 0x0034, 0x0000, 0x0000, 0x00e3, 0x0105,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x003d, 0x0132, 0x007d, 0x012e,
- 0x0000, 0x0000, 0x0000, 0x0086, 0x0000, 0x0136, 0x0000, 0x0000,
- 0x0000, 0x015f, 0x0167, 0x0000, 0x0000, 0x0000, 0x0041, 0x0052,
- 0x00a0, 0x0000, 0x0092, 0x0180, 0x0000, 0x0060, 0x0084, 0x002a,
- 0x00d0, 0x0110, 0x0000, 0x018a, 0x0014, 0x0048, 0x0000, 0x0146,
- 0x0000, 0x0021, 0x009a, 0x009b, 0x0000, 0x0000, 0x0178, 0x00a1,
- 0x001c, 0x0159, 0x00d7, 0x0000, 0x0155, 0x0000, 0x014c, 0x0006,
- 0x0000, 0x0000, 0x0000, 0x0000, 0x0168, 0x0000, 0x002f, 0x0000,
- 0x015b,
+ static const uint16_t g[789] = {
+ 0x0047, 0x015c, 0x002c, 0x00b5, 0x0000, 0x0000, 0x00ea, 0x0000,
+ 0x0000, 0x0127, 0x0000, 0x00a7, 0x00c0, 0x00ee, 0x0000, 0x0049,
+ 0x0000, 0x0000, 0x0000, 0x004a, 0x0136, 0x0000, 0x0140, 0x0000,
+ 0x0016, 0x0123, 0x002f, 0x00e7, 0x0000, 0x0000, 0x0000, 0x0042,
+ 0x0000, 0x00ee, 0x0000, 0x0000, 0x001c, 0x0009, 0x008b, 0x0000,
+ 0x0002, 0x012d, 0x0000, 0x0000, 0x001f, 0x0000, 0x0000, 0x0000,
+ 0x00c0, 0x0000, 0x0000, 0x0034, 0x004d, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x00de, 0x0152, 0x0000, 0x00d9, 0x00dc,
+ 0x00c5, 0x0096, 0x0001, 0x0058, 0x010e, 0x00ba, 0x0000, 0x0000,
+ 0x0021, 0x0000, 0x0000, 0x00f0, 0x0000, 0x0000, 0x00c6, 0x0000,
+ 0x0094, 0x008d, 0x0021, 0x0000, 0x0000, 0x00b8, 0x0060, 0x0000,
+ 0x000e, 0x0000, 0x0000, 0x003a, 0x0026, 0x0089, 0x003f, 0x0145,
+ 0x0050, 0x0000, 0x0000, 0x0170, 0x00f0, 0x0000, 0x0000, 0x0000,
+ 0x00b1, 0x007d, 0x0045, 0x00de, 0x006d, 0x0092, 0x0000, 0x0177,
+ 0x0049, 0x0000, 0x0000, 0x017a, 0x0000, 0x00e1, 0x0023, 0x0000,
+ 0x0000, 0x0000, 0x0096, 0x0098, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0176, 0x0089, 0x00fd, 0x0000, 0x0000, 0x00e5, 0x0000, 0x0000,
+ 0x0170, 0x0000, 0x014b, 0x0022, 0x0075, 0x0000, 0x0000, 0x0000,
+ 0x0170, 0x0015, 0x014f, 0x012e, 0x0041, 0x010c, 0x0159, 0x00c1,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0147, 0x0011, 0x0045, 0x0150,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x003e, 0x0000, 0x0000, 0x0168,
+ 0x00fe, 0x0000, 0x0000, 0x00b2, 0x0000, 0x007a, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0079, 0x0000, 0x0031, 0x015e, 0x0024,
+ 0x0090, 0x0000, 0x0000, 0x0000, 0x005b, 0x0000, 0x00eb, 0x0000,
+ 0x0142, 0x0091, 0x016f, 0x0180, 0x00a8, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x00e2, 0x0075, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0050, 0x016d, 0x00f5, 0x0018, 0x006d, 0x0059,
+ 0x00bb, 0x0048, 0x0000, 0x0000, 0x0000, 0x0000, 0x00ec, 0x0130,
+ 0x0054, 0x0067, 0x0000, 0x0000, 0x0000, 0x016e, 0x0072, 0x0154,
+ 0x0000, 0x0000, 0x0000, 0x012d, 0x00a5, 0x007c, 0x0000, 0x0036,
+ 0x0071, 0x0000, 0x0080, 0x0000, 0x00ba, 0x0000, 0x00e5, 0x0064,
+ 0x0173, 0x006c, 0x0043, 0x00ab, 0x0152, 0x0082, 0x0000, 0x0172,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0172, 0x010a, 0x0000, 0x003e,
+ 0x015b, 0x0000, 0x00dd, 0x0088, 0x0000, 0x003e, 0x0152, 0x006a,
+ 0x0000, 0x0000, 0x0000, 0x0169, 0x0076, 0x008e, 0x000a, 0x009b,
+ 0x0000, 0x0000, 0x0033, 0x014e, 0x0000, 0x0000, 0x0145, 0x0041,
+ 0x00bd, 0x012f, 0x0177, 0x0053, 0x0031, 0x0054, 0x0000, 0x0000,
+ 0x0000, 0x0105, 0x0000, 0x0000, 0x0000, 0x0000, 0x011b, 0x00b6,
+ 0x00c7, 0x00b4, 0x0000, 0x0000, 0x0112, 0x009b, 0x0000, 0x0000,
+ 0x00cd, 0x0000, 0x0052, 0x0094, 0x005d, 0x00f7, 0x00f5, 0x011a,
+ 0x0000, 0x0000, 0x00ed, 0x0000, 0x00c2, 0x0000, 0x0000, 0x0000,
+ 0x011b, 0x0000, 0x0000, 0x0000, 0x0124, 0x0064, 0x0000, 0x0000,
+ 0x0045, 0x0063, 0x0131, 0x0170, 0x0000, 0x0090, 0x0000, 0x0000,
+ 0x0000, 0x015d, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0023, 0x0146, 0x00ec, 0x0017, 0x0000, 0x0000, 0x0029, 0x0000,
+ 0x0181, 0x0000, 0x0000, 0x00a0, 0x0000, 0x015e, 0x0043, 0x0000,
+ 0x00f8, 0x0037, 0x0000, 0x0110, 0x0000, 0x0147, 0x0000, 0x009f,
+ 0x006f, 0x0000, 0x0140, 0x008c, 0x0000, 0x0169, 0x0000, 0x0061,
+ 0x005c, 0x0000, 0x0185, 0x0000, 0x0000, 0x0000, 0x001e, 0x0000,
+ 0x0000, 0x0042, 0x0111, 0x0181, 0x0000, 0x006e, 0x0000, 0x0000,
+ 0x0058, 0x0041, 0x0000, 0x0000, 0x0000, 0x0035, 0x0048, 0x00d9,
+ 0x0000, 0x0000, 0x0000, 0x0166, 0x0033, 0x0000, 0x00f1, 0x0022,
+ 0x00eb, 0x0110, 0x0000, 0x0000, 0x00ad, 0x0113, 0x015d, 0x0000,
+ 0x012e, 0x0000, 0x0000, 0x0000, 0x0136, 0x0000, 0x0189, 0x0000,
+ 0x0000, 0x00ce, 0x015a, 0x000b, 0x006f, 0x0000, 0x00a0, 0x0000,
+ 0x0000, 0x0112, 0x017a, 0x0000, 0x0000, 0x0040, 0x0138, 0x008b,
+ 0x007e, 0x0187, 0x0140, 0x00c2, 0x0000, 0x0061, 0x0000, 0x0155,
+ 0x0000, 0x0000, 0x0117, 0x0000, 0x00c5, 0x0000, 0x0000, 0x00a0,
+ 0x0000, 0x00e1, 0x0000, 0x0000, 0x0128, 0x0000, 0x0000, 0x0000,
+ 0x0188, 0x0000, 0x005f, 0x0000, 0x0133, 0x0044, 0x0000, 0x0000,
+ 0x0000, 0x0077, 0x0123, 0x0000, 0x010a, 0x005e, 0x0011, 0x00e2,
+ 0x0000, 0x004c, 0x0000, 0x004d, 0x0000, 0x0000, 0x0000, 0x0088,
+ 0x007a, 0x00fa, 0x0000, 0x004e, 0x0146, 0x0000, 0x006e, 0x0000,
+ 0x0000, 0x0000, 0x009a, 0x0000, 0x007b, 0x0000, 0x00ee, 0x0086,
+ 0x0000, 0x0000, 0x00ee, 0x0037, 0x0169, 0x0000, 0x0000, 0x00b5,
+ 0x0000, 0x0164, 0x0000, 0x00d0, 0x005d, 0x0000, 0x0139, 0x0078,
+ 0x00c4, 0x0000, 0x0127, 0x0062, 0x0124, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x009e, 0x00cc, 0x0000, 0x00f4, 0x0007,
+ 0x0158, 0x0051, 0x0000, 0x0000, 0x0168, 0x0000, 0x00fe, 0x0009,
+ 0x0141, 0x0000, 0x0154, 0x00ba, 0x0000, 0x00af, 0x016e, 0x0000,
+ 0x00b0, 0x00ed, 0x0000, 0x0000, 0x0000, 0x012a, 0x0000, 0x0000,
+ 0x0077, 0x0169, 0x0028, 0x0000, 0x0000, 0x0180, 0x0000, 0x013f,
+ 0x0000, 0x017e, 0x0000, 0x0000, 0x0000, 0x0024, 0x0000, 0x0000,
+ 0x0118, 0x0000, 0x0000, 0x0098, 0x0000, 0x016b, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0122, 0x0000, 0x0000, 0x0000, 0x0014, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x002f, 0x016d, 0x00d3, 0x017e, 0x0000,
+ 0x0000, 0x0052, 0x0172, 0x014b, 0x0141, 0x0000, 0x0000, 0x00c8,
+ 0x0000, 0x0000, 0x0128, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x00b0, 0x0057, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0033, 0x0000, 0x0000, 0x0000, 0x00af, 0x00d4, 0x0000,
+ 0x0000, 0x0000, 0x014a, 0x0038, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0137, 0x0000, 0x0000, 0x0018, 0x0000, 0x0004, 0x014d,
+ 0x0020, 0x001c, 0x0000, 0x0000, 0x0000, 0x0160, 0x00f0, 0x013e,
+ 0x0000, 0x0000, 0x0000, 0x00ca, 0x002a, 0x0000, 0x0000, 0x014b,
+ 0x0047, 0x0000, 0x0000, 0x0122, 0x00bc, 0x002a, 0x0000, 0x006b,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0099, 0x00f0, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0027, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0070, 0x0000, 0x0000, 0x0000, 0x000f, 0x0000,
+ 0x0009, 0x0061, 0x003f, 0x0135, 0x0000, 0x0123, 0x0181, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0115, 0x0059, 0x00a4, 0x0010,
+ 0x0000, 0x0000, 0x0000, 0x0156, 0x0014, 0x0000, 0x0000, 0x0000,
+ 0x0040, 0x00e5, 0x0000, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0003, 0x010b, 0x0046, 0x012f, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x004b, 0x0000, 0x002b, 0x0000, 0x0000, 0x0139, 0x00e8, 0x0000,
+ 0x0154, 0x0000, 0x0000, 0x0000, 0x0000, 0x005a, 0x0000, 0x00e2,
+ 0x0022, 0x00bd, 0x00a3, 0x00cb, 0x0144, 0x0143, 0x00f6, 0x0000,
+ 0x0026, 0x012b, 0x0000, 0x0053, 0x0000, 0x0000, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x0000, 0x0012, 0x0172, 0x0000, 0x0000,
+ 0x0000, 0x0000, 0x0000, 0x00b4, 0x0136,
};
uint32_t h[3];
- mi_vector_hash(key, keylen, 0x5dde027eU, h);
- return (g[h[0] % 793] + g[h[1] % 793]) % 396;
+ mi_vector_hash(key, keylen, 0x9090e0f1U, h);
+ return (g[h[0] % 789] + g[h[1] % 789]) % 394;
}
Index: src/lib/libterminfo/termcap_map.c
diff -u src/lib/libterminfo/termcap_map.c:1.1 src/lib/libterminfo/termcap_map.c:1.2
--- src/lib/libterminfo/termcap_map.c:1.1 Wed Feb 3 15:16:32 2010
+++ src/lib/libterminfo/termcap_map.c Fri Feb 12 10:18:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: termcap_map.c,v 1.1 2010/02/03 15:16:32 roy Exp $ */
+/* $NetBSD: termcap_map.c,v 1.2 2010/02/12 10:18:56 roy Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: termcap_map.c,v 1.1 2010/02/03 15:16:32 roy Exp $");
+__RCSID("$NetBSD: termcap_map.c,v 1.2 2010/02/12 10:18:56 roy Exp $");
typedef struct termcap_entry {
const char id[3];
@@ -508,8 +508,4 @@
{ "@7", TICODE_kend },
{ "@8", TICODE_kent },
{ "@9", TICODE_kext },
-
- /* Obsolete, even for termcap */
- { "bc", TICODE_cub1 },
- { "nl", TICODE_ind }
};
Index: src/lib/libterminfo/terminfo.5.in
diff -u src/lib/libterminfo/terminfo.5.in:1.10 src/lib/libterminfo/terminfo.5.in:1.11
--- src/lib/libterminfo/terminfo.5.in:1.10 Thu Feb 11 16:28:06 2010
+++ src/lib/libterminfo/terminfo.5.in Fri Feb 12 10:18:56 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: terminfo.5.in,v 1.10 2010/02/11 16:28:06 wiz Exp $
+.\" $NetBSD: terminfo.5.in,v 1.11 2010/02/12 10:18:56 roy Exp $
.\"
.\" Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 11, 2010
+.Dd February 12, 2010
.Dt TERMINFO 5
.Os
.Sh NAME
