Mon Jan 6 21:12:19 2014 UTC ()
Add __printflike where necessary.


(joerg)
diff -r1.7 -r1.8 src/crypto/external/bsd/netpgp/dist/src/lib/errors.h
diff -r1.10 -r1.11 src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h
cvs diff -r1.7 -r1.8 src/crypto/external/bsd/netpgp/dist/src/lib/errors.h (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/errors.h 2012/03/05 02:20:18 1.7
+++ src/crypto/external/bsd/netpgp/dist/src/lib/errors.h 2014/01/06 21:12:19 1.8
@@ -125,27 +125,27 @@ typedef struct pgp_error { @@ -125,27 +125,27 @@ typedef struct pgp_error {
125 int sys_errno; /* irrelevent unless errcode == 125 int sys_errno; /* irrelevent unless errcode ==
126 * PGP_E_SYSTEM_ERROR */ 126 * PGP_E_SYSTEM_ERROR */
127 char *comment; 127 char *comment;
128 const char *file; 128 const char *file;
129 int line; 129 int line;
130 struct pgp_error *next; 130 struct pgp_error *next;
131} pgp_error_t; 131} pgp_error_t;
132 132
133const char *pgp_errcode(const pgp_errcode_t); 133const char *pgp_errcode(const pgp_errcode_t);
134 134
135void  135void
136pgp_push_error(pgp_error_t **, pgp_errcode_t, 136pgp_push_error(pgp_error_t **, pgp_errcode_t,
137 int, 137 int,
138 const char *, int, const char *,...); 138 const char *, int, const char *,...) __printflike(6, 7);
139void pgp_print_error(pgp_error_t *); 139void pgp_print_error(pgp_error_t *);
140void pgp_print_errors(pgp_error_t *); 140void pgp_print_errors(pgp_error_t *);
141void pgp_free_errors(pgp_error_t *); 141void pgp_free_errors(pgp_error_t *);
142int pgp_has_error(pgp_error_t *, pgp_errcode_t); 142int pgp_has_error(pgp_error_t *, pgp_errcode_t);
143 143
144#define PGP_SYSTEM_ERROR_1(err,code,sys,fmt,arg) do { \ 144#define PGP_SYSTEM_ERROR_1(err,code,sys,fmt,arg) do { \
145 pgp_push_error(err,PGP_E_SYSTEM_ERROR,errno,__FILE__,__LINE__,sys);\ 145 pgp_push_error(err,PGP_E_SYSTEM_ERROR,errno,__FILE__,__LINE__,sys);\
146 pgp_push_error(err,code,0,__FILE__,__LINE__,fmt,arg); \ 146 pgp_push_error(err,code,0,__FILE__,__LINE__,fmt,arg); \
147} while(/*CONSTCOND*/0) 147} while(/*CONSTCOND*/0)
148 148
149#define PGP_MEMORY_ERROR(err) { \ 149#define PGP_MEMORY_ERROR(err) { \
150 fprintf(stderr, "Memory error\n"); \ 150 fprintf(stderr, "Memory error\n"); \
151} /* \todo placeholder for better error 151} /* \todo placeholder for better error
cvs diff -r1.10 -r1.11 src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h (expand / switch to unified diff)

--- src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h 2010/11/07 08:39:59 1.10
+++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgpsdk.h 2014/01/06 21:12:19 1.11
@@ -53,22 +53,22 @@ pgp_validate_key_sigs(pgp_validation_t * @@ -53,22 +53,22 @@ pgp_validate_key_sigs(pgp_validation_t *
53 const pgp_keyring_t *, 53 const pgp_keyring_t *,
54 pgp_cb_ret_t cb(const pgp_packet_t *, pgp_cbdata_t *)); 54 pgp_cb_ret_t cb(const pgp_packet_t *, pgp_cbdata_t *));
55 55
56unsigned 56unsigned
57pgp_validate_all_sigs(pgp_validation_t *, 57pgp_validate_all_sigs(pgp_validation_t *,
58 const pgp_keyring_t *, 58 const pgp_keyring_t *,
59 pgp_cb_ret_t cb(const pgp_packet_t *, pgp_cbdata_t *)); 59 pgp_cb_ret_t cb(const pgp_packet_t *, pgp_cbdata_t *));
60 60
61unsigned pgp_check_sig(const uint8_t *, 61unsigned pgp_check_sig(const uint8_t *,
62 unsigned, const pgp_sig_t *, const pgp_pubkey_t *); 62 unsigned, const pgp_sig_t *, const pgp_pubkey_t *);
63 63
64const char *pgp_get_info(const char *type); 64const char *pgp_get_info(const char *type);
65 65
66int pgp_asprintf(char **, const char *, ...); 66int pgp_asprintf(char **, const char *, ...) __printflike(2, 3);
67 67
68void netpgp_log(const char *, ...); 68void netpgp_log(const char *, ...) __printflike(1, 2);
69 69
70int netpgp_strcasecmp(const char *, const char *); 70int netpgp_strcasecmp(const char *, const char *);
71char *netpgp_strdup(const char *); 71char *netpgp_strdup(const char *);
72 72
73 73
74#endif 74#endif