X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=gnupgparse.c;h=c29ab84218e53e15d303f9989af1d341cca9a8a4;hp=c0ed056fea66946a2a9b381f94359af8400abaa2;hb=21d34545d4204a0f5672c8bdbeb6a79803eb3a54;hpb=96d53ff49c308769efbf708e1e65819077cb7af6

diff --git a/gnupgparse.c b/gnupgparse.c
index c0ed056..c29ab84 100644
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -88,7 +88,7 @@ static void fix_uid (char *uid)
     char *ob;
     size_t ibl, obl;
 
-    buf = safe_malloc (n + 1);
+    buf = mem_malloc (n + 1);
     ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
     iconv (cd, &ib, &ibl, &ob, &obl);
     if (!ibl) {
@@ -96,10 +96,10 @@ static void fix_uid (char *uid)
         memcpy (uid, buf, ob - buf);
         uid[ob - buf] = '\0';
       }
-      else if (ob - buf == n && (buf[n] = 0, mutt_strlen (buf) < n))
+      else if (ob - buf == n && (buf[n] = 0, str_len (buf) < n))
         memcpy (uid, buf, n);
     }
-    FREE (&buf);
+    mem_free (&buf);
     iconv_close (cd);
   }
 }
@@ -130,19 +130,19 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
       {
         debug_print (2, ("record type: %s\n", p));
 
-        if (!mutt_strcmp (p, "pub"));
-        else if (!mutt_strcmp (p, "sub"))
+        if (!str_cmp (p, "pub"));
+        else if (!str_cmp (p, "sub"))
           *is_subkey = 1;
-        else if (!mutt_strcmp (p, "sec"));
-        else if (!mutt_strcmp (p, "ssb"))
+        else if (!str_cmp (p, "sec"));
+        else if (!str_cmp (p, "ssb"))
           *is_subkey = 1;
-        else if (!mutt_strcmp (p, "uid"))
+        else if (!str_cmp (p, "uid"))
           is_uid = 1;
         else
           return NULL;
 
         if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
-          k = safe_calloc (sizeof *k, 1);
+          k = mem_calloc (sizeof *k, 1);
 
         break;
       }
@@ -246,9 +246,9 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
 
         debug_print (2, ("user ID: %s\n", p));
 
-        uid = safe_calloc (sizeof (pgp_uid_t), 1);
+        uid = mem_calloc (sizeof (pgp_uid_t), 1);
         fix_uid (p);
-        uid->addr = safe_strdup (p);
+        uid->addr = str_dup (p);
         uid->trust = trust;
         uid->flags |= flags;
         uid->parent = k;