diff --git a/g10/ChangeLog b/g10/ChangeLog index fbb2930f8..c8e650f80 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2008-03-26 Werner Koch + + * tdbio.c (lookup_hashtable): Make cmp args const. + (cmp_trec_fpr): Make FPR const. + (tdbio_search_trust_byfpr): Remove cast. + 2008-03-25 Werner Koch * keyserver.c (parse_keyrec): Take care of char defaulting to diff --git a/g10/tdbio.c b/g10/tdbio.c index 2429f1a5d..93628499e 100644 --- a/g10/tdbio.c +++ b/g10/tdbio.c @@ -1008,8 +1008,8 @@ drop_from_hashtable( ulong table, byte *key, int keylen, ulong recnum ) */ static int lookup_hashtable( ulong table, const byte *key, size_t keylen, - int (*cmpfnc)(void*, const TRUSTREC *), void *cmpdata, - TRUSTREC *rec ) + int (*cmpfnc)(const void*, const TRUSTREC *), + const void *cmpdata, TRUSTREC *rec ) { int rc; ulong hashrec, item; @@ -1467,10 +1467,10 @@ tdbio_new_recnum() static int -cmp_trec_fpr ( void *fpr, const TRUSTREC *rec ) +cmp_trec_fpr ( const void *fpr, const TRUSTREC *rec ) { - return rec->rectype == RECTYPE_TRUST - && !memcmp( rec->r.trust.fingerprint, fpr, 20); + return (rec->rectype == RECTYPE_TRUST + && !memcmp (rec->r.trust.fingerprint, fpr, 20)); } @@ -1481,7 +1481,7 @@ tdbio_search_trust_byfpr( const byte *fingerprint, TRUSTREC *rec ) /* locate the trust record using the hash table */ rc = lookup_hashtable( get_trusthashrec(), fingerprint, 20, - cmp_trec_fpr, (void*)fingerprint, rec ); + cmp_trec_fpr, fingerprint, rec ); return rc; } diff --git a/po/be.po b/po/be.po index 7a5638776..3d28cff9a 100644 --- a/po/be.po +++ b/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2003-10-30 16:35+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" diff --git a/po/ca.po b/po/ca.po index 8319b7335..ff537e1b9 100644 --- a/po/ca.po +++ b/po/ca.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2005-02-04 02:04+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" diff --git a/po/cs.po b/po/cs.po index 351868d43..3c2694399 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.3.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2004-11-26 09:12+0200\n" "Last-Translator: Roman Pavlik \n" "Language-Team: Czech \n" diff --git a/po/da.po b/po/da.po index 5bf0629ae..284c58ee1 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.0h\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2003-12-03 16:11+0100\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" diff --git a/po/de.po b/po/de.po index ea5fdeaa8..448e9b57d 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-2.0.6\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2008-03-26 09:56+0100\n" "Last-Translator: Walter Koch \n" "Language-Team: German \n" @@ -6574,7 +6574,9 @@ msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft geperrt ist\n" msgid "" "|A|Please enter the Admin PIN at the reader's keypad%%0A[remaining attempts: " "%d]" -msgstr "|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben%%0A[Verbliebene Versuche: %d]" +msgstr "" +"|A|Bitte die Admin-PIN auf der Tastatur des Kartenleser eingeben%%0A" +"[Verbliebene Versuche: %d]" #: scd/app-openpgp.c:1506 msgid "|A|Please enter the Admin PIN at the reader's keypad" diff --git a/po/el.po b/po/el.po index 35472e69a..8bbe5e88a 100644 --- a/po/el.po +++ b/po/el.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2003-06-27 12:00+0200\n" "Last-Translator: Dokianakis Theofanis \n" "Language-Team: Greek \n" diff --git a/po/eo.po b/po/eo.po index 15b833282..6b9753937 100644 --- a/po/eo.po +++ b/po/eo.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0.6d\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2002-04-14 14:33+0100\n" "Last-Translator: Edmund GRIMLEY EVANS \n" "Language-Team: Esperanto \n" diff --git a/po/es.po b/po/es.po index 641d4f936..efbeaaf50 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2007-08-16 11:35+0200\n" "Last-Translator: Jaime Suárez \n" "Language-Team: Spanish \n" diff --git a/po/et.po b/po/et.po index 3662e2bc5..f948adbd5 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2004-06-17 11:04+0300\n" "Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" diff --git a/po/fi.po b/po/fi.po index 98086bb36..d7128abbd 100644 --- a/po/fi.po +++ b/po/fi.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2004-06-16 22:40+0300\n" "Last-Translator: Tommi Vainikainen \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index ebcafa7f0..de8eacb08 100644 --- a/po/fr.po +++ b/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc2\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2005-06-28 00:24+0200\n" "Last-Translator: Gaël Quéri \n" "Language-Team: French \n" diff --git a/po/gl.po b/po/gl.po index 7a12a4c73..9b374b50c 100644 --- a/po/gl.po +++ b/po/gl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2003-12-04 11:39+0100\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" diff --git a/po/hu.po b/po/hu.po index 746932458..dab6917da 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2004-06-19 21:53+0200\n" "Last-Translator: Nagy Ferenc László \n" "Language-Team: Hungarian \n" diff --git a/po/id.po b/po/id.po index 7f101c057..b141bebf2 100644 --- a/po/id.po +++ b/po/id.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-id\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2004-06-17 16:32+0700\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" diff --git a/po/it.po b/po/it.po index 94c2f6d3c..8cf4dc128 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.1.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2004-06-16 17:01+0200\n" "Last-Translator: Marco d'Itri \n" "Language-Team: Italian \n" diff --git a/po/ja.po b/po/ja.po index 760aef99d..c70848544 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.3.92\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2004-11-23 11:14+0900\n" "Last-Translator: IIDA Yosiaki \n" "Language-Team: Japanese \n" diff --git a/po/nb.po b/po/nb.po index 6eec233e0..118449980 100644 --- a/po/nb.po +++ b/po/nb.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.3\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2006-06-13 20:31+0200\n" "Last-Translator: Trond Endrestøl \n" "Language-Team: Norwegian Bokmål \n" diff --git a/po/pl.po b/po/pl.po index 42f39ce9b..715e0063a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg-2.0.7\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2007-11-26 19:01+0100\n" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" diff --git a/po/pt.po b/po/pt.po index 44d101ac5..be1509308 100644 --- a/po/pt.po +++ b/po/pt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2002-09-13 18:26+0100\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" diff --git a/po/pt_BR.po b/po/pt_BR.po index ac0f4c20e..e87fd3dcb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2007-08-16 11:35+0200\n" "Last-Translator:\n" "Language-Team: ?\n" diff --git a/po/ro.po b/po/ro.po index c17613caa..5639da157 100644 --- a/po/ro.po +++ b/po/ro.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.2rc1\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2005-05-31 22:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" diff --git a/po/ru.po b/po/ru.po index 92f544c1d..33cfdf28c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: GnuPG 2.0.0\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2006-11-07 19:31+0300\n" "Last-Translator: Maxim Britov \n" "Language-Team: Russian \n" diff --git a/po/sk.po b/po/sk.po index 9ffe494fc..e90d73b25 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.2.5\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2004-07-20 15:52+0200\n" "Last-Translator: Michal Majer \n" "Language-Team: Slovak \n" diff --git a/po/sv.po b/po/sv.po index dc7542bd3..5677e98c9 100644 --- a/po/sv.po +++ b/po/sv.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg trunk\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2007-11-12 16:08+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" diff --git a/po/tr.po b/po/tr.po index 98cdb89ee..677215293 100644 --- a/po/tr.po +++ b/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.9.94\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2006-11-04 03:45+0200\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8cf1c0ae4..470868b48 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 1.4.4\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2006-07-02 10:58+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 9ab4127b3..5b654c69a 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnupg 2.0.8\n" "Report-Msgid-Bugs-To: translations@gnupg.org\n" -"POT-Creation-Date: 2008-03-26 09:52+0100\n" +"POT-Creation-Date: 2008-03-26 10:01+0100\n" "PO-Revision-Date: 2008-01-31 23:09+0800\n" "Last-Translator: Jedi Lin \n" "Language-Team: Chinese (traditional) \n" diff --git a/tests/openpgp/import.test b/tests/openpgp/import.test index f03b98a77..611704699 100755 --- a/tests/openpgp/import.test +++ b/tests/openpgp/import.test @@ -9,13 +9,13 @@ . $srcdir/defs.inc || exit 3 -#i=$srcdir/bug894-test.asc -#info "Checking bug 894: segv importing certain keys." -#if $GPG --import $i; then -# : -#else -# error "$i: import failed (bug 894)" -#fi +i=$srcdir/bug894-test.asc +info "Checking bug 894: segv importing certain keys." +if $GPG --import $i; then + : +else + error "$i: import failed (bug 894)" +fi