Merge pull request #2018 from gorogoro123/feature/remove_reinterpret_cast

reinterpret_cast 削除 (convert_util2.h)

Author: berryzplus

sakura_core/convert/convert_util2.h

@@ -97,7 +97,7 @@ int _DecodeQP( const CHAR_TYPE* pS, const int nLen, char* pDst )
 
 	while( pr < pS + nLen ){
 		/* =XX の形式でない部分をデコード */
-		if( sizeof(CHAR_TYPE) == 2 ){
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 			if( *pr != L'=' ){
 				*pw = static_cast<char>( *pr );
 				pw += 1;
@@ -221,7 +221,7 @@ int _DecodeBase64( const CHAR_TYPE *pSrc, const int nSrcLen, char *pDest )
 		int i = 0;
 		bool bret;
 		for( ; i < nsrclen; i++ ){
-			if( sizeof(CHAR_TYPE) == 2 ){
+			if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 				bret = ( pSrc[nsrclen-1-i] == L'=' );
 			}else{
 				bret = ( pSrc[nsrclen-1-i] == '=' );
@@ -415,7 +415,7 @@ bool CheckUUHeader( const CHAR_TYPE *pSrc, const int nLen, WCHAR *pszFilename )
 	// 先頭の空白・改行文字をスキップ
 	for( nstartidx = 0; nstartidx < nLen; ++nstartidx ){
 		CHAR_TYPE c = pSrc[nstartidx];
-		if( sizeof(CHAR_TYPE) == 2 ){
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 			if( c != L'\r' && c != L'\n' && c != L' ' && c != L'\t' ){
 				break;
 			}
@@ -439,13 +439,13 @@ bool CheckUUHeader( const CHAR_TYPE *pSrc, const int nLen, WCHAR *pszFilename )
 		// error.
 		return false;
 	}
-	if( sizeof(CHAR_TYPE) == 2 ){
+	if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 		if( wcsncmp_literal(pwstart, L"begin") != 0 ){
 			// error.
 			return false;
 		}
 	}else{
-		if( strncmp_literal(reinterpret_cast<const char*>(pwstart), "begin") != 0 ){
+		if( strncmp_literal(pwstart, "begin") != 0 ){
 			// error.
 			return false;
 		}
@@ -459,7 +459,7 @@ bool CheckUUHeader( const CHAR_TYPE *pSrc, const int nLen, WCHAR *pszFilename )
 		return false;
 	}
 	for( int i = 0; i < nwlen; i++ ){
-		if( sizeof(CHAR_TYPE) == 2 ){
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 			// WCHAR の場合の処理
 			if( !iswdigit(pwstart[i]) || (pwstart[i] == L'8' || pwstart[i] == L'9') ){
 				// error.
@@ -480,7 +480,7 @@ bool CheckUUHeader( const CHAR_TYPE *pSrc, const int nLen, WCHAR *pszFilename )
 	// 末尾の空白・改行文字をスキップ
 	for( ; nwlen > 0; --nwlen ){
 		CHAR_TYPE c = pwstart[nwlen-1];
-		if( sizeof(CHAR_TYPE) == 2 ){
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 			if( !WCODE::IsLineDelimiterBasic(c) && c != L' ' && c != L'\t' ){
 				break;
 			}
@@ -521,7 +521,7 @@ bool CheckUUFooter( const CHAR_TYPE *pS, const int nLen )
 	// 先頭の改行・空白文字をスキップ
 	for( nstartidx = 0; nstartidx < nLen; ++nstartidx ){
 		CHAR_TYPE c = pS[nstartidx];
-		if( sizeof(CHAR_TYPE) == 2 ){
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 			// WCHAR の場合の処理
 			if( c != L'\r' && c != L'\n' && c != L' ' && c != L'\t' ){
 				break;
@@ -541,13 +541,13 @@ bool CheckUUFooter( const CHAR_TYPE *pS, const int nLen )
 	if( nsrclen < 3 ){
 		return false;
 	}
-	if( sizeof(CHAR_TYPE) == 2 ){
+	if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 		if( wcsncmp_literal(&pS[nstartidx], L"end") != 0 ){
 			// error.
 			return false;
 		}
 	}else{
-		if( strncmp_literal(reinterpret_cast<const char*>(&pS[nstartidx]), "end") != 0 ){
+		if( strncmp_literal(&pS[nstartidx], "end") != 0 ){
 			// error.
 			return false;
 		}
@@ -557,7 +557,7 @@ bool CheckUUFooter( const CHAR_TYPE *pS, const int nLen )
 	// end の後が空白文字ばかりであることを確認
 	for( ; i < nsrclen; ++i ){
 		CHAR_TYPE c = psrc[i];
-		if( sizeof(CHAR_TYPE) == 2 ){
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
 			// WCHAR の場合の処理
 			if( !WCODE::IsLineDelimiterBasic(c) && c != L' ' && c != L'\t' ){
 				return false;
@@ -613,8 +613,8 @@ int _DecodeMimeHeader( const CHAR_TYPE* pSrc, const int nSrcLen, CMemory* pcMem_
 
 	if( pSrc+14 < pSrc+nSrcLen ){
 		// JIS の場合
-		if( sizeof(CHAR_TYPE) == 2 ){
-			ncmpresult = wcsnicmp_literal( reinterpret_cast<const wchar_t*>(&pSrc[0]), L"=?ISO-2022-JP?" );
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
+			ncmpresult = wcsnicmp_literal( &pSrc[0], L"=?ISO-2022-JP?" );
 		}else{
 			ncmpresult = strnicmp_literal( &pSrc[0], "=?ISO-2022-JP?" );
 		}
@@ -626,8 +626,8 @@ int _DecodeMimeHeader( const CHAR_TYPE* pSrc, const int nSrcLen, CMemory* pcMem_
 	}
 	if( pSrc+8 < pSrc+nSrcLen ){
 		// UTF-8 の場合
-		if( sizeof(CHAR_TYPE) == 2 ){
-			ncmpresult = wcsnicmp_literal( reinterpret_cast<const wchar_t*>(&pSrc[0]), L"=?UTF-8?" );
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
+			ncmpresult = wcsnicmp_literal( &pSrc[0], L"=?UTF-8?" );
 		}else{
 			ncmpresult = strnicmp_literal( &pSrc[0], "=?UTF-8?" );
 		}
@@ -660,9 +660,9 @@ finish_first_detect:;
 		pcMem_alt->SetRawData( "", 0 );
 		return 0;
 	}
-	if( sizeof(CHAR_TYPE) == 2 ){
-		ncmpresult1 = wcsnicmp_literal( reinterpret_cast<const wchar_t*>(&pSrc[nLen_part1]), L"B?" );
-		ncmpresult2 = wcsnicmp_literal( reinterpret_cast<const wchar_t*>(&pSrc[nLen_part1]), L"Q?" );
+	if constexpr ( sizeof(CHAR_TYPE) == 2 ){
+		ncmpresult1 = wcsnicmp_literal( &pSrc[nLen_part1], L"B?" );
+		ncmpresult2 = wcsnicmp_literal( &pSrc[nLen_part1], L"Q?" );
 	}else{
 		ncmpresult1 = strnicmp_literal( &pSrc[nLen_part1], "B?" );
 		ncmpresult2 = strnicmp_literal( &pSrc[nLen_part1], "Q?" );
@@ -684,8 +684,8 @@ finish_first_detect:;
 	pr_base = pSrc + nLen_part1 + nLen_part2;
 	pr = pSrc + nLen_part1 + nLen_part2;
 	for( ; pr < pSrc+nSrcLen-1; ++pr ){
-		if( sizeof(CHAR_TYPE) == 2 ){
-			ncmpresult = wcsncmp_literal( reinterpret_cast<const wchar_t*>(pr), L"?=" );
+		if constexpr ( sizeof(CHAR_TYPE) == 2 ){
+			ncmpresult = wcsncmp_literal( pr, L"?=" );
 		}else{
 			ncmpresult = strncmp_literal( pr, "?=" );
 		}