X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=159a9d5dccd0d6037eb0535fbdf5fa75412f2042;hp=577db1ac22b614274249a7f187f031c0042e8abc;hb=ba4333b5854d2caf6b486372b060376990fe089e;hpb=74a2265af51ce89bca845adc1d68f273c9933c13 diff --git a/pgppubring.c b/pgppubring.c index 577db1a..159a9d5 100644 --- a/pgppubring.c +++ b/pgppubring.c @@ -246,13 +246,13 @@ static pgp_key_t pgp_parse_pgp2_key (unsigned char *buff, size_t l) "%08lX", id); } - p->keyid = safe_strdup ((char *) scratch); + p->keyid = str_dup ((char *) scratch); return p; bailout: - FREE (&p); + mem_free (&p); return NULL; } @@ -348,7 +348,7 @@ static pgp_key_t pgp_parse_pgp3_key (unsigned char *buff, size_t l) id); } - p->keyid = safe_strdup ((char *) scratch); + p->keyid = str_dup ((char *) scratch); return p; } @@ -636,7 +636,7 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp) case PT_SIG: { if (lsig) { - pgp_sig_t *signature = safe_calloc (sizeof (pgp_sig_t), 1); + pgp_sig_t *signature = mem_calloc (sizeof (pgp_sig_t), 1); *lsig = signature; lsig = &signature->next; @@ -667,12 +667,12 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp) if (!addr) break; - chr = safe_malloc (l); + chr = mem_malloc (l); memcpy (chr, buff + 1, l - 1); chr[l - 1] = '\0'; - *addr = uid = safe_calloc (1, sizeof (pgp_uid_t)); /* XXX */ + *addr = uid = mem_calloc (1, sizeof (pgp_uid_t)); /* XXX */ uid->addr = chr; uid->parent = p; uid->trust = 0; @@ -710,7 +710,7 @@ static int pgpring_string_matches_hint (const char *s, const char *hints[], return 1; for (i = 0; i < nhints; i++) { - if (mutt_stristr (s, hints[i]) != NULL) + if (str_isstr (s, hints[i]) != NULL) return 1; } @@ -743,11 +743,11 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[], char *error_buf; size_t error_buf_len; - error_buf_len = sizeof ("fopen: ") - 1 + mutt_strlen (ringfile) + 1; - error_buf = safe_malloc (error_buf_len); + error_buf_len = sizeof ("fopen: ") - 1 + str_len (ringfile) + 1; + error_buf = mem_malloc (error_buf_len); snprintf (error_buf, error_buf_len, "fopen: %s", ringfile); perror (error_buf); - FREE (&error_buf); + mem_free (&error_buf); return; } @@ -764,7 +764,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[], keypos = pos; } else if (pt == PT_NAME) { - char *tmp = safe_malloc (l); + char *tmp = mem_malloc (l); memcpy (tmp, buff + 1, l - 1); tmp[l - 1] = '\0'; @@ -785,7 +785,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[], pgp_free_key (&p); } - FREE (&tmp); + mem_free (&tmp); } FGETPOS (rfp, pos);