aboutsummaryrefslogtreecommitdiffstats
path: root/g10/import.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2006-07-26 11:25:36 +0000
committerWerner Koch <[email protected]>2006-07-26 11:25:36 +0000
commitccd5fc47589e63acc123847c41ae65bcd9bf445f (patch)
treee395f0558c2f32f1ac738bbf5876680346efcc86 /g10/import.c
parent * curl-shim.c (curl_easy_perform): Minor cleanup of proxy code. (diff)
downloadgnupg-ccd5fc47589e63acc123847c41ae65bcd9bf445f.tar.gz
gnupg-ccd5fc47589e63acc123847c41ae65bcd9bf445f.zip
Fixed memory allocation bug and typos.
Diffstat (limited to '')
-rw-r--r--g10/import.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/g10/import.c b/g10/import.c
index 6e581cfab..e2ad0e314 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -243,7 +243,7 @@ import( IOBUF inp, const char* fname,struct stats_s *stats,
unsigned char **fpr,size_t *fpr_len,unsigned int options )
{
PACKET *pending_pkt = NULL;
- KBNODE keyblock;
+ KBNODE keyblock = NULL;
int rc = 0;
getkey_disable_caches();
@@ -566,10 +566,8 @@ check_prefs_warning(PKT_public_key *pk)
log_info(_("WARNING: key %s contains preferences for unavailable\n"),
keystr_from_pk(pk));
/* TRANSLATORS: This string is belongs to the previous one. They are
- only split up to allow printing of a common prefix. The
- check_prefs_warning tag is a hack to make this string unique. */
- log_info(_(" algorithms on these user IDs:\n"
- "\0" "check_prefs_warning"));
+ only split up to allow printing of a common prefix. */
+ log_info(_(" algorithms on these user IDs:\n"));
}
static void