diff options
| author | Werner Koch <wk@gnupg.org> | 2008-10-17 21:18:46 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2008-10-17 21:18:46 +0200 |
| commit | 0698c5169fca5b7969e6b0fa4de22b693e7fd2e4 (patch) | |
| tree | ebfa56dde985a7925e9dc6ea60bda96569106718 /g10 | |
| parent | Reset the context lock flag after a failed dirmngr start which may happend (diff) | |
| download | gnupg2-0698c5169fca5b7969e6b0fa4de22b693e7fd2e4.tar.xz gnupg2-0698c5169fca5b7969e6b0fa4de22b693e7fd2e4.zip | |
Use more warning options with modern GCCs.
Other minor changes.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 15 | ||||
| -rw-r--r-- | g10/main.h | 2 | ||||
| -rw-r--r-- | g10/pubkey-enc.c | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 4b25d8316..a65425cce 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,9 +1,16 @@ +2008-10-17 Werner Koch <wk@g10code.com> + + * main.h (idea_cipher_warn): Use do while construct in place of an + empty definition. + 2008-10-03 David Shaw <dshaw@jabberwocky.com> - * main.h, mainproc.c (check_sig_and_print), - keylist.c (list_keyblock_print), pkclist.c (do_edit_ownertrust), - keyedit.c (menu_showphoto), photoid.c (generate_photo_id, - show_photos), misc.c (pct_expando): Add %v and %V expandos so + * main.h, mainproc.c (check_sig_and_print) + * keylist.c (list_keyblock_print) + * pkclist.c (do_edit_ownertrust) + * keyedit.c (menu_showphoto) + * photoid.c (generate_photo_id, show_photos) + * misc.c (pct_expando): Add %v and %V expandos so that displaying photo IDs can show the attribute validity tag (%v) and string (%V). Originally by Daniel Gillmor. diff --git a/g10/main.h b/g10/main.h index d6b5a967e..be60d17ce 100644 --- a/g10/main.h +++ b/g10/main.h @@ -93,7 +93,7 @@ int openpgp_md_test_algo( int algo ); #ifdef USE_IDEA void idea_cipher_warn( int show ); #else -#define idea_cipher_warn(a) +#define idea_cipher_warn(a) do { } while (0) #endif struct expando_args diff --git a/g10/pubkey-enc.c b/g10/pubkey-enc.c index b7e76a874..5a8c0c01f 100644 --- a/g10/pubkey-enc.c +++ b/g10/pubkey-enc.c @@ -246,7 +246,7 @@ get_it( PKT_pubkey_enc *enc, DEK *dek, PKT_secret_key *sk, u32 *keyid ) log_info(_("cipher algorithm %d%s is unknown or disabled\n"), dek->algo, dek->algo == CIPHER_ALGO_IDEA? " (IDEA)":""); if(dek->algo==CIPHER_ALGO_IDEA) - idea_cipher_warn(0); + idea_cipher_warn (0); } dek->algo = 0; goto leave; |