Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/lib I forgot that the fa...
details: https://anonhg.NetBSD.org/src/rev/552efbefdbd2
branches: trunk
changeset: 759109:552efbefdbd2
user: agc <agc%NetBSD.org@localhost>
date: Mon Nov 29 06:21:40 2010 +0000
description:
I forgot that the fastctype.[ch] files were still in this directory, and
have no need to be here - remove them, and just use native <ctype.h>
diffstat:
crypto/external/bsd/netpgp/dist/src/lib/Makefile.am | 3 +-
crypto/external/bsd/netpgp/dist/src/lib/Makefile.in | 11 +-
crypto/external/bsd/netpgp/dist/src/lib/bufgap.c | 5 +-
crypto/external/bsd/netpgp/dist/src/lib/fastctype.c | 370 --------------------
crypto/external/bsd/netpgp/dist/src/lib/fastctype.h | 62 ---
crypto/external/bsd/netpgp/dist/src/lib/misc.c | 6 +-
crypto/external/bsd/netpgp/dist/src/lib/ssh2pgp.c | 3 +-
7 files changed, 8 insertions(+), 452 deletions(-)
diffs (truncated from 584 to 300 lines):
diff -r d8b6b3edd455 -r 552efbefdbd2 crypto/external/bsd/netpgp/dist/src/lib/Makefile.am
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Mon Nov 29 04:20:12 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.am Mon Nov 29 06:21:40 2010 +0000
@@ -1,4 +1,4 @@
-## $NetBSD: Makefile.am,v 1.9 2010/11/06 03:42:59 agc Exp $
+## $NetBSD: Makefile.am,v 1.10 2010/11/29 06:21:40 agc Exp $
AM_CFLAGS = $(WARNCFLAGS)
@@ -11,7 +11,6 @@
compress.c \
create.c \
crypto.c \
- fastctype.c \
keyring.c \
misc.c \
netpgp.c \
diff -r d8b6b3edd455 -r 552efbefdbd2 crypto/external/bsd/netpgp/dist/src/lib/Makefile.in
--- a/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Mon Nov 29 04:20:12 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/Makefile.in Mon Nov 29 06:21:40 2010 +0000
@@ -55,7 +55,7 @@
libnetpgp_la_DEPENDENCIES = ../libmj/libmj.la
am_libnetpgp_la_OBJECTS = libnetpgp_la-bufgap.lo \
libnetpgp_la-compress.lo libnetpgp_la-create.lo \
- libnetpgp_la-crypto.lo libnetpgp_la-fastctype.lo \
+ libnetpgp_la-crypto.lo \
libnetpgp_la-keyring.lo libnetpgp_la-misc.lo \
libnetpgp_la-netpgp.lo libnetpgp_la-openssl_crypto.lo \
libnetpgp_la-packet-parse.lo libnetpgp_la-packet-print.lo \
@@ -210,7 +210,6 @@
compress.c \
create.c \
crypto.c \
- fastctype.c \
keyring.c \
misc.c \
netpgp.c \
@@ -318,7 +317,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-compress.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-create.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-crypto.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-fastctype.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-keyring.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-misc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetpgp_la-netpgp.Plo@am__quote@
@@ -382,13 +380,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-c -o libnetpgp_la-crypto.lo `test -f 'crypto.c' || echo '$(srcdir)/'`crypto.c
-libnetpgp_la-fastctype.lo: fastctype.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-MT libnetpgp_la-fastctype.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-fastctype.Tpo -c -o libnetpgp_la-fastctype.lo `test -f 'fastctype.c' || echo '$(srcdir)/'`fastctype.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnetpgp_la-fastctype.Tpo $(DEPDIR)/libnetpgp_la-fastctype.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='fastctype.c' object='libnetpgp_la-fastctype.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-c -o libnetpgp_la-fastctype.lo `test -f 'fastctype.c' || echo '$(srcdir)/'`fastctype.c
-
libnetpgp_la-keyring.lo: keyring.c
@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnetpgp_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-MT libnetpgp_la-keyring.lo -MD -MP -MF $(DEPDIR)/libnetpgp_la-keyring.Tpo -c -o libnetpgp_la-keyring.lo `test -f 'keyring.c' || echo '$(srcdir)/'`keyring.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libnetpgp_la-keyring.Tpo $(DEPDIR)/libnetpgp_la-keyring.Plo
diff -r d8b6b3edd455 -r 552efbefdbd2 crypto/external/bsd/netpgp/dist/src/lib/bufgap.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c Mon Nov 29 04:20:12 2010 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/lib/bufgap.c Mon Nov 29 06:21:40 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bufgap.c,v 1.4 2010/08/15 16:10:56 agc Exp $ */
+/* $NetBSD: bufgap.c,v 1.5 2010/11/29 06:21:40 agc Exp $ */
/*-
* Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -38,8 +38,8 @@
#include <sys/stat.h>
#endif
+#include <ctype.h>
#include <stdio.h>
-
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
@@ -50,7 +50,6 @@
#include <string.h>
#endif
-#include "fastctype.h"
#include "bufgap.h"
#include "defs.h"
diff -r d8b6b3edd455 -r 552efbefdbd2 crypto/external/bsd/netpgp/dist/src/lib/fastctype.c
--- a/crypto/external/bsd/netpgp/dist/src/lib/fastctype.c Mon Nov 29 04:20:12 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,370 +0,0 @@
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Alistair Crooks (agc%NetBSD.org@localhost)
- *
- * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-#include <stdint.h>
-
-#include "fastctype.h"
-
-#define UPPER 0x01
-#define LOWER 0x02
-#define OCTAL 0x04
-#define DEC 0x08
-#define HEX 0x10
-#define SPACE 0x20
-#define PUNCT 0x40
-
-static const uint8_t fastctypes[] = {
- 0, /* 0 */
- 0, /* 1 */
- 0, /* 2 */
- 0, /* 3 */
- 0, /* 4 */
- 0, /* 5 */
- 0, /* 6 */
- 0, /* 7 */
- 0, /* 8 */
- SPACE, /* 9 */
- SPACE, /* 10 */
- 0, /* 11 */
- 0, /* 12 */
- SPACE, /* 13 */
- 0, /* 14 */
- 0, /* 15 */
- 0, /* 16 */
- 0, /* 17 */
- 0, /* 18 */
- 0, /* 19 */
- 0, /* 20 */
- 0, /* 21 */
- 0, /* 22 */
- 0, /* 23 */
- 0, /* 24 */
- 0, /* 25 */
- 0, /* 26 */
- 0, /* 27 */
- 0, /* 28 */
- 0, /* 29 */
- 0, /* 30 */
- 0, /* 31 */
- SPACE, /* 32 */
- PUNCT, /* 33 */
- PUNCT, /* 34 */
- PUNCT, /* 35 */
- PUNCT, /* 36 */
- PUNCT, /* 37 */
- PUNCT, /* 38 */
- PUNCT, /* 39 */
- PUNCT, /* 40 */
- PUNCT, /* 41 */
- PUNCT, /* 42 */
- PUNCT, /* 43 */
- PUNCT, /* 44 */
- PUNCT, /* 45 */
- PUNCT, /* 46 */
- PUNCT, /* 47 */
- OCTAL | DEC | HEX, /* 48 */
- OCTAL | DEC | HEX, /* 49 */
- OCTAL | DEC | HEX, /* 50 */
- OCTAL | DEC | HEX, /* 51 */
- OCTAL | DEC | HEX, /* 52 */
- OCTAL | DEC | HEX, /* 53 */
- OCTAL | DEC | HEX, /* 54 */
- OCTAL | DEC | HEX, /* 55 */
- DEC | HEX, /* 56 */
- DEC | HEX, /* 57 */
- PUNCT, /* 58 */
- PUNCT, /* 59 */
- PUNCT, /* 60 */
- PUNCT, /* 61 */
- PUNCT, /* 62 */
- PUNCT, /* 63 */
- PUNCT, /* 64 */
- HEX | UPPER, /* 65 */
- HEX | UPPER, /* 66 */
- HEX | UPPER, /* 67 */
- HEX | UPPER, /* 68 */
- HEX | UPPER, /* 69 */
- HEX | UPPER, /* 70 */
- UPPER, /* 71 */
- UPPER, /* 72 */
- UPPER, /* 73 */
- UPPER, /* 74 */
- UPPER, /* 75 */
- UPPER, /* 76 */
- UPPER, /* 77 */
- UPPER, /* 78 */
- UPPER, /* 79 */
- UPPER, /* 80 */
- UPPER, /* 81 */
- UPPER, /* 82 */
- UPPER, /* 83 */
- UPPER, /* 84 */
- UPPER, /* 85 */
- UPPER, /* 86 */
- UPPER, /* 87 */
- UPPER, /* 88 */
- UPPER, /* 89 */
- UPPER, /* 90 */
- PUNCT, /* 91 */
- PUNCT, /* 92 */
- PUNCT, /* 93 */
- PUNCT, /* 94 */
- PUNCT, /* 95 */
- PUNCT, /* 96 */
- HEX | LOWER, /* 97 */
- HEX | LOWER, /* 98 */
- HEX | LOWER, /* 99 */
- HEX | LOWER, /* 100 */
- HEX | LOWER, /* 101 */
- HEX | LOWER, /* 102 */
- LOWER, /* 103 */
- LOWER, /* 104 */
- LOWER, /* 105 */
- LOWER, /* 106 */
- LOWER, /* 107 */
- LOWER, /* 108 */
- LOWER, /* 109 */
- LOWER, /* 110 */
- LOWER, /* 111 */
- LOWER, /* 112 */
- LOWER, /* 113 */
- LOWER, /* 114 */
- LOWER, /* 115 */
- LOWER, /* 116 */
- LOWER, /* 117 */
- LOWER, /* 118 */
- LOWER, /* 119 */
- LOWER, /* 120 */
- LOWER, /* 121 */
- LOWER, /* 122 */
- PUNCT, /* 123 */
- PUNCT, /* 124 */
- PUNCT, /* 125 */
- PUNCT, /* 126 */
- PUNCT, /* 127 */
- 0, /* 128 */
- 0, /* 129 */
- 0, /* 130 */
- 0, /* 131 */
- 0, /* 132 */
- 0, /* 133 */
- 0, /* 134 */
- 0, /* 135 */
- 0, /* 136 */
- 0, /* 137 */
- 0, /* 138 */
- 0, /* 139 */
- 0, /* 140 */
- 0, /* 141 */
- 0, /* 142 */
- 0, /* 143 */
- 0, /* 144 */
- 0, /* 145 */
- 0, /* 146 */
- 0, /* 147 */
- 0, /* 148 */
- 0, /* 149 */
- 0, /* 150 */
- 0, /* 151 */
- 0, /* 152 */
- 0, /* 153 */
- 0, /* 154 */
- 0, /* 155 */
- 0, /* 156 */
- 0, /* 157 */
- 0, /* 158 */
- 0, /* 159 */
- 0, /* 160 */
- 0, /* 161 */
- 0, /* 162 */
- 0, /* 163 */
- 0, /* 164 */
- 0, /* 165 */
- 0, /* 166 */
- 0, /* 167 */
- 0, /* 168 */
Home |
Main Index |
Thread Index |
Old Index