Thank you! I am going to push it. Cheers, Giuseppe
Daniele <[email protected]> writes: > Hi guys, > there's a method in mime_utils.cpp which is not being used by MyServer at > all, I'm > attaching a patch which removes the useless method from mime_utils.cpp and its > declaration from mime_utils.h. > > bye :) > > > From b403a1f4679b6c1ba7580776372d01911aac9afc Mon Sep 17 00:00:00 2001 > From: Daniele Cocca <[email protected]> > Date: Fri, 26 Mar 2010 17:45:33 +0100 > Subject: [PATCH] Removed a method which is never being used in MyServer. > > --- > myserver/include/base/base64/mime_utils.h | 1 - > myserver/src/base/base64/mime_utils.cpp | 86 > ----------------------------- > 2 files changed, 0 insertions(+), 87 deletions(-) > > diff --git a/myserver/include/base/base64/mime_utils.h > b/myserver/include/base/base64/mime_utils.h > index 4fce9bf..87145e2 100644 > --- a/myserver/include/base/base64/mime_utils.h > +++ b/myserver/include/base/base64/mime_utils.h > @@ -33,7 +33,6 @@ public: > ~CBase64Utils (); > char* decode (const char *in, int *bufsize); > char* encode (const char *in, int bufsize); > - char* mimeDecodeMailHeaderField (char *s); > }; > > class CQPUtils > diff --git a/myserver/src/base/base64/mime_utils.cpp > b/myserver/src/base/base64/mime_utils.cpp > index 4a2bf96..92701f4 100644 > --- a/myserver/src/base/base64/mime_utils.cpp > +++ b/myserver/src/base/base64/mime_utils.cpp > @@ -190,92 +190,6 @@ const char QpEncodeMap[] = > > > > -char* CBase64Utils::mimeDecodeMailHeaderField (char *s) > -{ > - > - if (s == NULL) return s; > - if (s[strlen (s) - 2] == '\r') > - { > - s[strlen (s) - 2] = '\0'; > - } > - char *s1 = s; > - char *rest = NULL; > - char *start = NULL; > - while (*s1 == ' ') s1++; > - if (strupos (s1, (char*) "=?") > 0) > - { > - int startendpos =static_cast<int>(strupos (s1, (char*)"=?")); > - start = new char[startendpos + 1]; > - strncpy (start, s, startendpos); > - start[startendpos] = '\0'; > - s1 += startendpos; > - } > - if (strupos (s1, (char*) "=?") == 0) > - { > - int alloclen; > - char *decodedText=0; > - int plainpos =static_cast<int>(strupos (s1, (char*) "Q?=")); > - if (plainpos > 0) > - { > - plainpos += 3; > - char *m = s1 + plainpos; > - plainpos +=static_cast<int>(strupos (m, (char*)"?=")); > - } > - else > - { > - plainpos = static_cast<int>(strupos (s1, (char*) "?=")); > - } > - if (plainpos > 1) > - { > - char *mid = s1 + plainpos + 2; > - s1[plainpos] = '\0'; > - if (strlen (mid) > 0) > - { > - rest = new char[strlen (mid) + 1]; > - strncpy (rest, mid,(strlen (mid) + 2)); > - } > - } > - if (strupos (s1, (char*) "?Q?") > 0) > - { > - CQPUtils qp; > - int pos = static_cast<int>(strupos (s1, (char*) "?Q?")); > - s1 += pos; > - if (strlen (s1) < 4) return s; > - s1 += 3; > - decodedText = qp.decode (s1); > - } > - if (strupos (s1, (char*) "?B?") > 0) > - { > - CBase64Utils bu; > - int sLen; > - int pos = static_cast<int>(strupos (s1, (char*) "?B?")); > - s1 += pos; > - if (strlen (s1) < 4) return s; > - s1 += 3; > - sLen = static_cast<int>(strlen (s1)); > - decodedText = bu.decode (s1, &sLen); > - } > - alloclen =static_cast<int>(strlen (decodedText)) + 1; > - if (start != NULL) alloclen +=static_cast<int>(strlen (start)); > - if (rest != NULL) alloclen +=static_cast<int>(strlen (rest)); > - alloclen *= sizeof (char); > - s = (char*)gnulib::realloc (s, alloclen); > - s[0] = '\0'; > - if (start != NULL) > - { > - strncat (s, start, strlen (s)); > - } > - strncat (s, decodedText, strlen (s)); > - if (rest != NULL) > - { > - strncat (s, rest, strlen (s)); > - } > - delete [] decodedText; > - } > - return s; > -} > - > - > CBase64Utils::CBase64Utils () > { > ErrorCode = 0;
