X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Fencode_rfc2047.c;h=72d27ce5f084b7142983a33fe64db17a66ecafa3;hp=4e4cbefbf3ada215daef01e242dc64e175aefdee;hb=f78e7c6e6e616cc4ff2bee8a726365fafef2d8ce;hpb=c29e62470a481bcd4d54760b0578ca4bc1201681

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index 4e4cbef..72d27ce 100644
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -48,9 +48,6 @@ static char *address_headers[] = {
                         c == '/' || c == '=' || c == '_')
 #define qpspecial(c) (c < ' ' || c == '=' || c == '?' || c == '_')
 
-#define base64len(n) ((((n) + 2) / 3) * 4)    /* String len to base64 len */
-#define strbase64(n) ((n) / 4 * 3)            /* Chars that fit in base64 */
-
 #define ENCODELINELIMIT	76
 
 static void unfold_header(char **, int);
@@ -59,7 +56,6 @@ static int field_encode_quoted(const char *, char **, const char *, int,
 		int, int);
 static int scanstring(const char *, int *, int *, int *);
 static int utf8len(const char *);
-/*static int pref_encoding(int, int, int);*/
 
 /*
 ** Encode a message header using RFC 2047 encoding.  We make the assumption
@@ -634,38 +630,3 @@ scanstring(const char *string, int *asciilen, int *eightbitchars,
 
 	return *eightbitchars > 0;
 }
-
-#if 0
-
-/*
-** This function is to be used to decide which encoding algorithm we should
-** use if one is not given.  Basically, we pick whichever one is the shorter
-** of the two.
-**
-** Arguments are:
-**
-** ascii	- Number of ASCII characters in to-be-encoded string.
-** specials	- Number of ASCII characters in to-be-encoded string that
-**                still require encoding under quoted-printable.  Note that
-**                these are included in the "ascii" total.
-** eightbit	- Eight-bit characters in the to-be-encoded string.
-**
-** Returns one of CE_BASE64 or CE_QUOTED.
-**/
-static int
-pref_encoding(int ascii, int specials, int eightbits)
-{
-	/*
-	** The length of the q-p encoding is:
-	**
-	** ascii - specials + (specials + eightbits) * 3.
-	**
-	** The length of the base64 encoding is:
-	**
-	** base64len(ascii + eightbits)	(See macro for details)
-	*/
-	return base64len(ascii + eightbits) < (ascii - specials +
-			(specials + eightbits) * 3) ? CE_BASE64 : CE_QUOTED;
-}
-
-#endif