move mutt_get_parameter -> parameter_getval into mime.c

[apps/madmutt.git] / lib-crypt / crypt.c

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index af29c47..57021b1 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -242,7 +242,7 @@ int mutt_is_multipart_signed (BODY * b)
       !b->subtype || ascii_strcasecmp (b->subtype, "signed"))
     return 0;
 
-  if (!(p = mutt_get_parameter ("protocol", b->parameter)))
+  if (!(p = parameter_getval(b->parameter, "protocol")))
     return 0;
 
   if (!(ascii_strcasecmp (p, "multipart/mixed")))
@@ -266,7 +266,7 @@ int mutt_is_multipart_encrypted (BODY * b)
 
   if (!b || b->type != TYPEMULTIPART ||
       !b->subtype || ascii_strcasecmp (b->subtype, "encrypted") ||
-      !(p = mutt_get_parameter ("protocol", b->parameter)) ||
+      !(p = parameter_getval(b->parameter, "protocol")) ||
       ascii_strcasecmp (p, "application/pgp-encrypted"))
     return 0;
 
@@ -282,12 +282,12 @@ int mutt_is_application_pgp (BODY * m)
   if (m->type == TYPEAPPLICATION) {
     if (!ascii_strcasecmp (m->subtype, "pgp")
         || !ascii_strcasecmp (m->subtype, "x-pgp-message")) {
-      if ((p = mutt_get_parameter ("x-action", m->parameter))
+      if ((p = parameter_getval(m->parameter, "x-action"))
           && (!ascii_strcasecmp (p, "sign")
               || !ascii_strcasecmp (p, "signclear")))
         t |= PGPSIGN;
 
-      if ((p = mutt_get_parameter ("format", m->parameter)) &&
+      if ((p = parameter_getval(m->parameter, "format")) &&
           !ascii_strcasecmp (p, "keys-only"))
         t |= PGPKEY;
 
@@ -302,9 +302,9 @@ int mutt_is_application_pgp (BODY * m)
       t |= PGPKEY;
   }
   else if (m->type == TYPETEXT && ascii_strcasecmp ("plain", m->subtype) == 0) {
-    if (((p = mutt_get_parameter ("x-mutt-action", m->parameter))
-         || (p = mutt_get_parameter ("x-action", m->parameter))
-         || (p = mutt_get_parameter ("action", m->parameter)))
+    if (((p = parameter_getval(m->parameter, "x-mutt-action"))
+         || (p = parameter_getval(m->parameter, "x-action"))
+         || (p = parameter_getval(m->parameter, "action")))
         && !ascii_strncasecmp ("pgp-sign", p, 8))
       t |= PGPSIGN;
     else if (p && !ascii_strncasecmp ("pgp-encrypt", p, 11))
@@ -330,7 +330,7 @@ int mutt_is_application_smime (BODY * m)
     /* S/MIME MIME types don't need x- anymore, see RFC2311 */
     if (!ascii_strcasecmp (m->subtype, "x-pkcs7-mime") ||
         !ascii_strcasecmp (m->subtype, "pkcs7-mime")) {
-      if ((t = mutt_get_parameter ("smime-type", m->parameter))) {
+      if ((t = parameter_getval(m->parameter, "smime-type"))) {
         if (!ascii_strcasecmp (t, "enveloped-data"))
           return SMIMEENCRYPT;
         else if (!ascii_strcasecmp (t, "signed-data"))
@@ -349,7 +349,7 @@ int mutt_is_application_smime (BODY * m)
     else if (ascii_strcasecmp (m->subtype, "octet-stream"))
       return 0;
 
-    t = mutt_get_parameter ("name", m->parameter);
+    t = parameter_getval(m->parameter, "name");
 
     if (!t)
       t = m->d_filename;
@@ -679,7 +679,7 @@ int mutt_signed_handler (BODY * a, STATE * s)
   short goodsig = 1;
   int rc = 0;
 
-  protocol = mutt_get_parameter ("protocol", a->parameter);
+  protocol = parameter_getval(a->parameter, "protocol");
   a = a->parts;
 
   /* extract the protocol information */