[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/libverify Move __printfl...

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

details:   https://anonhg.NetBSD.org/src/rev/37a98f55f748
branches:  trunk
changeset: 325796:37a98f55f748
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Jan 06 22:59:10 2014 +0000

description:
Move __printflike to the prototype. Add explicit cast for void * ->
char * to make GCC happy.

diffstat:

 crypto/external/bsd/netpgp/dist/src/libverify/libverify.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 374438ffeea9 -r 37a98f55f748 crypto/external/bsd/netpgp/dist/src/libverify/libverify.c
--- a/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c Mon Jan 06 22:43:15 2014 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/libverify/libverify.c Mon Jan 06 22:59:10 2014 +0000
@@ -145,7 +145,8 @@
 
 /* Forward declarations */
 static int read_all_packets(pgpv_t */*pgp*/, pgpv_mem_t */*mem*/, const char */*op*/);
-static int read_binary_file(pgpv_t */*pgp*/, const char */*op*/, const char */*fmt*/, ...);
+static int read_binary_file(pgpv_t */*pgp*/, const char */*op*/, const char */*fmt*/, ...)
+    __printflike(3, 4);
 static int read_binary_memory(pgpv_t */*pgp*/, const char */*op*/, const void */*memory*/, size_t /*size*/);
 static int pgpv_find_keyid(pgpv_t */*pgp*/, const char */*strkeyid*/, uint8_t */*keyid*/);
 
@@ -2046,7 +2047,7 @@
 }
 
 /* create a filename, read it, and then parse according to "op" */
-__printflike(3, 4) static int
+static int
 read_binary_file(pgpv_t *pgp, const char *op, const char *fmt, ...)
 {
        va_list args;
@@ -2335,7 +2336,7 @@
        if (keyring) {
                return (size > 0) ?
                        read_binary_memory(pgp, "pubring", keyring, (size_t)size) :
-                       read_binary_file(pgp, "pubring", "%s", keyring);
+                       read_binary_file(pgp, "pubring", "%s", (const char *)keyring);
        }
        return read_binary_file(pgp, "pubring", "%s/%s", nonnull_getenv("HOME"), ".gnupg/pubring.gpg");
 }