X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=gnupgparse.c;h=cdce751bf796a68db41d2a0dd961d6d384c28b83;hp=a05d2da3ebc0a6b2c7b8387e89ea396556ee1208;hb=0743a84074b93443d1256f53d19074659dca1772;hpb=2a06362a155582cd59ae2ef6f0df71694a7eede3 diff --git a/gnupgparse.c b/gnupgparse.c index a05d2da..cdce751 100644 --- a/gnupgparse.c +++ b/gnupgparse.c @@ -42,8 +42,6 @@ #include "pgp.h" #include "charset.h" -/* for hexval */ - #include "lib/debug.h" /**************** @@ -206,7 +204,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k) debug_print (2, ("key id: %s\n", p)); if (!(*is_subkey && option (OPTPGPIGNORESUB))) - str_replace (&k->keyid, p); + m_strreplace(&k->keyid, p); break; } @@ -312,7 +310,7 @@ pgp_key_t pgp_get_candidates (pgp_ring_t keyring, LIST * hints) if ((devnull = open ("/dev/null", O_RDWR)) == -1) return NULL; - str_replace (&_chs, Charset); + m_strreplace(&_chs, Charset); thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull, keyring, hints);