Module Name: src Committed By: christos Date: Sun Mar 9 07:01:42 UTC 2014
Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpverify: bzlib.c main.c Log Message: fix unused To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.2 --- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c:1.1 Sat Mar 8 19:15:45 2014 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/bzlib.c Sun Mar 9 03:01:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */ +/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */ /*-------------------------------------------------------------*/ @@ -35,7 +35,7 @@ #include "bzlib_private.h" -/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */ +/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */ /*-------------------------------------------------------------*/ @@ -930,6 +930,8 @@ BZFILE * bzopen_or_bzdopen int smallMode = 0; int nUnused = 0; + __USE(blockSize100k); + if (mode == NULL) return NULL; while (*mode) { switch (*mode) { @@ -1080,7 +1082,7 @@ const char * BZ_API(BZ2_bzerror) (BZFILE /*-------------------------------------------------------------*/ /*--- end bzlib.c ---*/ /*-------------------------------------------------------------*/ -/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */ +/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */ /*-------------------------------------------------------------*/ @@ -1726,7 +1728,7 @@ Int32 BZ2_decompress ( DState* s ) /*-------------------------------------------------------------*/ /*--- end decompress.c ---*/ /*-------------------------------------------------------------*/ -/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */ +/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */ /*-------------------------------------------------------------*/ @@ -1830,7 +1832,7 @@ UInt32 BZ2_crc32Table[256] = { /*-------------------------------------------------------------*/ /*--- end crctable.c ---*/ /*-------------------------------------------------------------*/ -/* $NetBSD: bzlib.c,v 1.1 2014/03/09 00:15:45 agc Exp $ */ +/* $NetBSD: bzlib.c,v 1.2 2014/03/09 07:01:42 christos Exp $ */ /*-------------------------------------------------------------*/ Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.3 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.4 --- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c:1.3 Sat Mar 8 19:15:45 2014 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/main.c Sun Mar 9 03:01:42 2014 @@ -122,7 +122,6 @@ verify_data(pgpv_t *pgp, const char *cmd int main(int argc, char **argv) { - const char *modifiers; const char *keyring; const char *cmd; ssize_t cc; @@ -138,7 +137,6 @@ main(int argc, char **argv) ssh = 0; ok = 1; cmd = "verify"; - modifiers = NULL; while ((i = getopt(argc, argv, "S:c:k:v")) != -1) { switch(i) { case 'S':