From a7c24ca48995cf2bf436156302f96b91bf135409 Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Mon, 13 Nov 2017 15:03:31 +0100 Subject: Code modernize ... * replace 0/NULL with nullptr [using clang-tidy] --- plugins/YAMN/src/mails/decode.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/YAMN/src/mails/decode.cpp') diff --git a/plugins/YAMN/src/mails/decode.cpp b/plugins/YAMN/src/mails/decode.cpp index d5c49e7ebe..6a767b7a17 100644 --- a/plugins/YAMN/src/mails/decode.cpp +++ b/plugins/YAMN/src/mails/decode.cpp @@ -209,7 +209,7 @@ int GetCharsetFromString(char *input,size_t size) char *pin=input; char *pout,*parser; - if ((size<1) || (parser=pout=new char[size+1])==NULL) + if ((size<1) || (parser=pout=new char[size+1])==nullptr) return -1; while((*pin != 0) && (pin-input< (INT_PTR)size)) { @@ -405,17 +405,17 @@ int ConvertStringToUnicode(char *stream,unsigned int cp,WCHAR **out) break; } if (Index==-1) - streamlen=MultiByteToWideChar(cp,0,stream,-1,NULL,0); + streamlen=MultiByteToWideChar(cp,0,stream,-1,nullptr,0); else - streamlen=MultiByteToWideChar(cp,MB_USEGLYPHCHARS,stream,-1,NULL,0); + streamlen=MultiByteToWideChar(cp,MB_USEGLYPHCHARS,stream,-1,nullptr,0); - if (*out != NULL) + if (*out != nullptr) outlen=mir_wstrlen(*out); else outlen=0; temp=new WCHAR[streamlen+outlen+1]; - if (*out != NULL) + if (*out != nullptr) { for (dest=temp;*src != (WCHAR)0;src++,dest++) //copy old string from *out to temp *dest=*src; @@ -444,11 +444,11 @@ void ConvertCodedStringToUnicode(char *stream,WCHAR **storeto,DWORD cp,int mode) char *start=stream,*finder,*finderend; char Encoding=0; - if (stream==NULL) + if (stream==nullptr) return; while(WS(start)) start++; - WCHAR *tempstore=0; + WCHAR *tempstore=nullptr; if (!ConvertStringToUnicode(stream,cp,&tempstore))return; size_t tempstoreLength = mir_wstrlen(tempstore); @@ -477,7 +477,7 @@ void ConvertCodedStringToUnicode(char *stream,WCHAR **storeto,DWORD cp,int mode) if (Encoding != 0) { int size = 0,codeend; - char *pcodeend = 0; + char *pcodeend = nullptr; finder=finderend+2; if (CODED(finder)) @@ -530,14 +530,14 @@ void ConvertCodedStringToUnicode(char *stream,WCHAR **storeto,DWORD cp,int mode) DecodedResult[len+1]=0; finderend++; } - WCHAR *oneWord=0; + WCHAR *oneWord=nullptr; if (ConvertStringToUnicode(DecodedResult,cp,&oneWord)) { size_t len = mir_wstrlen(oneWord); memcpy(&tempstore[outind],oneWord,len*sizeof(WCHAR)); outind += len; } delete oneWord; - oneWord = 0; + oneWord = nullptr; delete[] DecodedResult; start = finderend; } else if (!EOS(start)) start++; -- cgit v1.2.3