rename convert_to_7bit

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index 5fde82519caea1394168598c0f308768d995d407..4c6462af434eca32e736bc24c409fe6e243a0373 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -669,7 +669,7 @@ int crypt_write_signed(struct Body *a, struct State *s, const char *tempfile)
   return 0;
 }
 
-void convert_to_7bit(struct Body *a)
+void crypt_convert_to_7bit(struct Body *a)
 {
   if (!WithCrypto)
     return;
@@ -681,10 +681,10 @@ void convert_to_7bit(struct Body *a)
       if (a->encoding != ENC7BIT)
       {
         a->encoding = ENC7BIT;
-        convert_to_7bit(a->parts);
+        crypt_convert_to_7bit(a->parts);
       }
       else if (((WithCrypto & APPLICATION_PGP) != 0) && PgpStrictEnc)
-        convert_to_7bit(a->parts);
+        crypt_convert_to_7bit(a->parts);
     }
     else if (a->type == TYPEMESSAGE &&
              (mutt_str_strcasecmp(a->subtype, "delivery-status") != 0))

diff --git a/ncrypt/crypt.h b/ncrypt/crypt.h
index 5e75d3a261519d875ffb0c412396576ab90385c1..40b8e3c5444fed5742aa54f356905eb94e694cd0 100644 (file)
--- a/ncrypt/crypt.h
+++ b/ncrypt/crypt.h
@@ -28,7 +28,7 @@
 struct Body;
 struct State;
 
-void convert_to_7bit(struct Body *a);
+void crypt_convert_to_7bit(struct Body *a);
 void crypt_current_time(struct State *s, char *app_name);
 int crypt_write_signed(struct Body *a, struct State *s, const char *tempfile);
 const char *crypt_get_fingerprint_or_id(char *p, const char **pphint,

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index b110e0d4bfdb3c437133a5054b59f28c789accca..5d4cf95c7160fa2069cc0bc69600ffc2afa419ba 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -980,7 +980,7 @@ static struct Body *sign_message(struct Body *a, int use_smime)
   gpgme_data_t message, signature;
   gpgme_sign_result_t sigres;
 
-  convert_to_7bit(a); /* Signed data _must_ be in 7-bit format. */
+  crypt_convert_to_7bit(a); /* Signed data _must_ be in 7-bit format. */
 
   message = body_to_data_object(a, 1);
   if (!message)
@@ -1116,7 +1116,7 @@ struct Body *pgp_gpgme_encrypt_message(struct Body *a, char *keylist, int sign)
     return NULL;
 
   if (sign)
-    convert_to_7bit(a);
+    crypt_convert_to_7bit(a);
   gpgme_data_t plaintext = body_to_data_object(a, 0);
   if (!plaintext)
   {

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 3333e92ce4fed162bb3577bcfd89816e039c050e..bd9ac99973ccfa2650067e7a46c1d8f8816ed217 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -1101,7 +1101,7 @@ struct Body *pgp_sign_message(struct Body *a)
   bool empty = true;
   pid_t thepid;
 
-  convert_to_7bit(a); /* Signed data _must_ be in 7-bit format. */
+  crypt_convert_to_7bit(a); /* Signed data _must_ be in 7-bit format. */
 
   mutt_mktemp(sigfile, sizeof(sigfile));
   FILE *fp = mutt_file_fopen(sigfile, "w");
@@ -1389,7 +1389,7 @@ struct Body *pgp_encrypt_message(struct Body *a, char *keylist, int sign)
   }
 
   if (sign)
-    convert_to_7bit(a);
+    crypt_convert_to_7bit(a);
 
   mutt_write_mime_header(a, fptmp);
   fputc('\n', fptmp);

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 02a29f486873cc973f5dbe0ee5657d41e5605f39..b86737bfaf26cd6172b782d6ef123d33c22f3bb8 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -1483,7 +1483,7 @@ struct Body *smime_sign_message(struct Body *a)
     return NULL;
   }
 
-  convert_to_7bit(a); /* Signed data _must_ be in 7-bit format. */
+  crypt_convert_to_7bit(a); /* Signed data _must_ be in 7-bit format. */
 
   mutt_mktemp(filetosign, sizeof(filetosign));
   sfp = mutt_file_fopen(filetosign, "w+");