Module Name: src Committed By: joerg Date: Tue Mar 11 17:21:05 UTC 2014
Modified Files: src/crypto/external/bsd/netpgp/dist/src/netpgpverify: libverify.c misc.h Log Message: Annotate format strings. Remove string constant in front of real format string. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h 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/libverify.c diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.2 --- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c:1.1 Sun Mar 9 00:15:45 2014 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/libverify.c Tue Mar 11 17:21:05 2014 @@ -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 @@ findstr(str_t *array, const char *name) } /* 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 @@ pgpv_read_ssh_pubkeys(pgpv_t *pgp, const 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); Index: src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.1 src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.2 --- src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h:1.1 Sun Mar 9 00:15:45 2014 +++ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/misc.h Tue Mar 11 17:21:05 2014 @@ -45,7 +45,7 @@ void *netpgp_allocate(size_t /*n*/, size 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