From 4a4096bf5d55b9ab033dee43ef40e84dbf34f666 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 16 Oct 2023 15:22:53 +0300 Subject: YAMN: slack debug code removed --- protocols/YAMN/src/mails/decode.cpp | 8 ++--- protocols/YAMN/src/mails/mime.cpp | 66 ++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 37 deletions(-) (limited to 'protocols/YAMN/src/mails') diff --git a/protocols/YAMN/src/mails/decode.cpp b/protocols/YAMN/src/mails/decode.cpp index 8d8b9e7324..9356d12c43 100644 --- a/protocols/YAMN/src/mails/decode.cpp +++ b/protocols/YAMN/src/mails/decode.cpp @@ -188,7 +188,7 @@ int GetCharsetFromString(char *input, size_t size) *parser = 0; #ifdef DEBUG_DECODECODEPAGE - DebugLog(DecodeFile, "%s", pout); + mir_writeLogA(DecodeFile, "%s", pout); #endif for (int i = 0; i < CPLENALL; i++) { @@ -239,7 +239,7 @@ int DecodeQuotedPrintable(char *Src, char *Dst, int DstLen, BOOL isQ) { #ifdef DEBUG_DECODEQUOTED char *DstTemp = Dst; - DebugLog(DecodeFile, "%s", Src); + mir_writeLogA(DecodeFile, "%s", Src); #endif for (auto *Limit = Dst + DstLen; *Src != 0 && Dst < Limit; Src++) { @@ -279,7 +279,7 @@ int DecodeQuotedPrintable(char *Src, char *Dst, int DstLen, BOOL isQ) *Dst = 0; #ifdef DEBUG_DECODEQUOTED - DebugLog(DecodeFile, "%s", DstTemp); + mir_writeLogA(DecodeFile, "%s", DstTemp); #endif return 1; } @@ -304,7 +304,7 @@ int ConvertStringToUnicode(char *stream, unsigned int cp, wchar_t **out) cp = CP_ACP; #ifdef DEBUG_DECODECODEPAGE - DebugLog(DecodeFile, "%d", cp); + mir_writeLogA(DecodeFile, "%d", cp); #endif for (Index = 0; Index < sizeof(CodePagesZeroFlags) / sizeof(CodePagesZeroFlags[0]); Index++) diff --git a/protocols/YAMN/src/mails/mime.cpp b/protocols/YAMN/src/mails/mime.cpp index cc4261d236..87f863c2eb 100644 --- a/protocols/YAMN/src/mails/mime.cpp +++ b/protocols/YAMN/src/mails/mime.cpp @@ -209,55 +209,55 @@ void ExtractShortHeader(CMimeItem *items, CShortHeader *head) if (items->value == nullptr) continue; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, ""); + mir_writeLogA(DecodeFile, ""); #endif ExtractAddressFromLine(items->value, &head->From, &head->FromNick); #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif } else if (0 == _strnicmp(items->name, "Return-Path", 11)) { if (items->value == nullptr) continue; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, ""); + mir_writeLogA(DecodeFile, ""); #endif ExtractAddressFromLine(items->value, &head->ReturnPath, &head->ReturnPathNick); #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif } else if (0 == _strnicmp(items->name, "Subject", 7)) { if (items->value == nullptr) continue; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, ""); + mir_writeLogA(DecodeFile, ""); #endif ExtractStringFromLine(items->value, &head->Subject); #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif } else if (0 == _strnicmp(items->name, "Body", 4)) { if (items->value == nullptr) continue; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, ""); + mir_writeLogA(DecodeFile, ""); #endif ExtractStringFromLine(items->value, &head->Body); #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif } else if (0 == _strnicmp(items->name, "Date", 4)) { if (items->value == nullptr) continue; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, ""); + mir_writeLogA(DecodeFile, ""); #endif ExtractStringFromLine(items->value, &head->Date); #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif } else if (0 == _strnicmp(items->name, "Content-Type", 12)) { @@ -266,11 +266,11 @@ void ExtractShortHeader(CMimeItem *items, CShortHeader *head) char *ContentType = nullptr, *CharSetStr; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, ""); + mir_writeLogA(DecodeFile, ""); #endif ExtractStringFromLine(items->value, &ContentType); #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif ToLower(ContentType); if (nullptr != (CharSetStr = ExtractFromContentType(ContentType, "charset="))) { @@ -283,7 +283,7 @@ void ExtractShortHeader(CMimeItem *items, CShortHeader *head) if (items->value == nullptr) continue; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, ""); + mir_writeLogA(DecodeFile, ""); #endif if (head->Priority != -1) { if (0 == strncmp(items->value, "low", 3)) @@ -294,19 +294,19 @@ void ExtractShortHeader(CMimeItem *items, CShortHeader *head) head->Priority = 1; } #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif } else if (0 == _strnicmp(items->name, "X-Priority", 10)) { if (items->value == nullptr) continue; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, ""); + mir_writeLogA(DecodeFile, ""); #endif if ((*items->value >= '1') && (*items->value <= '5')) head->Priority = *items->value - '0'; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif } @@ -387,7 +387,7 @@ void ExtractHeader(CMimeItem *items, int &CP, CHeader *head) CShortHeader ShortHeader = {}; ShortHeader.Priority = ShortHeader.CP = -1; #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif ExtractShortHeader(items, &ShortHeader); @@ -395,61 +395,61 @@ void ExtractHeader(CMimeItem *items, int &CP, CHeader *head) CP = ShortHeader.CP == -1 ? CP : ShortHeader.CP; #ifdef DEBUG_DECODE if (NULL != ShortHeader.From) - DebugLog(DecodeFile, "%s%s%s%s%s%s%s%s%s%s%s\n"); - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "%s\n"); + mir_writeLogA(DecodeFile, "\n"); #endif head->wszFrom = ConvertCodedStringToUnicode(ShortHeader.From, CP, MIME_PLAIN); #ifdef DEBUG_DECODE if (NULL != head->From) - DebugLogW(DecodeFile, L"%s\n", head->From); + mir_writeLogW(DecodeFile, L"%s\n", head->From); #endif head->wszFromNick = ConvertCodedStringToUnicode(ShortHeader.FromNick, CP, MIME_MAIL); #ifdef DEBUG_DECODE if (NULL != head->FromNick) - DebugLogW(DecodeFile, L"%s\n", head->FromNick); + mir_writeLogW(DecodeFile, L"%s\n", head->FromNick); #endif head->wszReturnPath = ConvertCodedStringToUnicode(ShortHeader.ReturnPath, CP, MIME_PLAIN); #ifdef DEBUG_DECODE if (NULL != head->ReturnPath) - DebugLogW(DecodeFile, L"%s\n", head->ReturnPath); + mir_writeLogW(DecodeFile, L"%s\n", head->ReturnPath); #endif head->wszReturnPathNick = ConvertCodedStringToUnicode(ShortHeader.ReturnPathNick, CP, MIME_MAIL); #ifdef DEBUG_DECODE if (NULL != head->ReturnPathNick) - DebugLogW(DecodeFile, L"%s\n", head->ReturnPathNick); + mir_writeLogW(DecodeFile, L"%s\n", head->ReturnPathNick); #endif head->wszSubject = ConvertCodedStringToUnicode(ShortHeader.Subject, CP, MIME_PLAIN); #ifdef DEBUG_DECODE if (NULL != head->Subject) - DebugLogW(DecodeFile, L"%s\n", head->Subject); + mir_writeLogW(DecodeFile, L"%s\n", head->Subject); #endif head->wszDate = ConvertCodedStringToUnicode(ShortHeader.Date, CP, MIME_PLAIN); #ifdef DEBUG_DECODE if (NULL != head->Date) - DebugLogW(DecodeFile, L"%s\n", head->Date); + mir_writeLogW(DecodeFile, L"%s\n", head->Date); #endif head->wszBody = ConvertCodedStringToUnicode(ShortHeader.Body, CP, MIME_PLAIN); #ifdef DEBUG_DECODE if (NULL != head->Body) - DebugLogW(DecodeFile, L"%s\n", head->Body); + mir_writeLogW(DecodeFile, L"%s\n", head->Body); #endif #ifdef DEBUG_DECODE - DebugLog(DecodeFile, "\n"); + mir_writeLogA(DecodeFile, "\n"); #endif DeleteShortHeaderContent(&ShortHeader); -- cgit v1.2.3