[src/trunk]: src/crypto/external/bsd/netpgp/dist/src/netpgpverify Annotate fo...

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

details:   https://anonhg.NetBSD.org/src/rev/20783041743c
branches:  trunk
changeset: 327572:20783041743c
user:      joerg <joerg%NetBSD.org@localhost>
date:      Tue Mar 11 17:21:05 2014 +0000

description:
Annotate format strings. Remove string constant in front of real format
string.

diffstat:

 crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c |  6 +++---
 crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h      |  2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 73ae881a6dd6 -r 20783041743c crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c      Tue Mar 11 17:20:23 2014 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c      Tue Mar 11 17:21:05 2014 +0000
@@ -151,7 +151,7 @@
 
 /* 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*/);
 
 /* read a file into the pgpv_mem_t struct */
@@ -2221,7 +2221,7 @@
 }
 
 /* read public key from the ssh pubkey file */
-static int
+static __printflike(3, 4) int
 read_ssh_file(pgpv_t *pgp, pgpv_primarykey_t *primary, const char *fmt, ...)
 {
        pgpv_signed_userid_t     userid;
@@ -2690,7 +2690,7 @@
                if (!read_ssh_file(pgp, &primary, "%s", keyring)) {
                        return 0;
                }
-       } else if (!read_ssh_file(pgp, &primary, "pubring", "%s/%s", nonnull_getenv("HOME"), ".ssh/id_rsa.pub")) {
+       } else if (!read_ssh_file(pgp, &primary, "%s/%s", nonnull_getenv("HOME"), ".ssh/id_rsa.pub")) {
                return 0;
        }
        ARRAY_APPEND(pgp->primaries, primary);
diff -r 73ae881a6dd6 -r 20783041743c crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h
--- a/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h   Tue Mar 11 17:20:23 2014 +0000
+++ b/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h   Tue Mar 11 17:21:05 2014 +0000
@@ -45,7 +45,7 @@
 void netpgp_deallocate(void */*ptr*/, size_t /*size*/);
 
 #ifndef _KERNEL
-void logmessage(const int /*level*/, const char */*fmt*/, ...);
+void logmessage(const int /*level*/, const char */*fmt*/, ...) __printflike(2, 3);
 #endif
 
 __END_DECLS