walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

add some Windows TCHAR scanf and printf conversions

This commit is contained in:
Robert Reif 2011-09-25 10:02:27 -04:00
parent 545aa9e55b
commit 6e8bf43dc0
2 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/tokenize.cpp
View File

@ -10607,6 +10607,26 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
{
tok->str("strnlen");
}
else if (Token::simpleMatch(tok, "_tprintf ("))
{
tok->str("printf");
}
else if (Token::simpleMatch(tok, "_stprintf ("))
{
tok->str("sprintf");
}
else if (Token::simpleMatch(tok, "_sntprintf ("))
{
tok->str("snprintf");
}
else if (Token::simpleMatch(tok, "_tscanf ("))
{
tok->str("scanf");
}
else if (Token::simpleMatch(tok, "_stscanf ("))
{
tok->str("sscanf");
}
else if (Token::Match(tok, "_T ( %str% )"))
{
tok->deleteThis();
@ -10644,6 +10664,26 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
{
tok->str("wcsnlen");
}
else if (Token::simpleMatch(tok, "_tprintf ("))
{
tok->str("wprintf");
}
else if (Token::simpleMatch(tok, "_stprintf ("))
{
tok->str("swprintf");
}
else if (Token::simpleMatch(tok, "_sntprintf ("))
{
tok->str("snwprintf");
}
else if (Token::simpleMatch(tok, "_tscanf ("))
{
tok->str("wscanf");
}
else if (Token::simpleMatch(tok, "_stscanf ("))
{
tok->str("swscanf");
}
else if (Token::Match(tok, "_T ( %str% )"))
{
tok->deleteThis();

20
test/testtokenize.cpp
View File

@ -6106,6 +6106,11 @@ private:
" _tcscpy(dst, src);"
" dst[0] = 0;"
" _tcscat(dst, src);"
" _tprintf(_T(\"Hello world!\n\"));"
" _stprintf(dst, _T(\"Hello!\n\"));"
" _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\n\"));"
" _tscanf(_T(\"%s\"), dst);"
" _stscanf(dst, _T(\"%s\"), dst);"
"}";
const char expected[] = "unsigned short wc ; "
"char c ; "
@ -6119,6 +6124,11 @@ private:
"strcpy ( dst , src ) ; "
"dst [ 0 ] = 0 ; "
"strcat ( dst , src ) ; "
"printf ( \"Hello world!\n\" ) ; "
"sprintf ( dst , \"Hello!\n\" ) ; "
"snprintf ( dst , sizeof ( dst ) / sizeof ( char ) , \"Hello world!\n\" ) ; "
"scanf ( \"%s\" , dst ) ; "
"sscanf ( dst , \"%s\" , dst ) ; "
"}";
ASSERT_EQUALS(expected, tokenizeAndStringify(code, false, true, Settings::Win32A));
}
@ -6137,6 +6147,11 @@ private:
" _tcscpy(dst, src);"
" dst[0] = 0;"
" _tcscat(dst, src);"
" _tprintf(_T(\"Hello world!\n\"));"
" _stprintf(dst, _T(\"Hello!\n\"));"
" _sntprintf(dst, sizeof(dst) / sizeof(TCHAR), _T(\"Hello world!\n\"));"
" _tscanf(_T(\"%s\"), dst);"
" _stscanf(dst, _T(\"%s\"), dst);"
"}";
const char expected[] = "unsigned short wc ; "
"unsigned short c ; "
@ -6150,6 +6165,11 @@ private:
"wcscpy ( dst , src ) ; "
"dst [ 0 ] = 0 ; "
"wcscat ( dst , src ) ; "
"wprintf ( \"Hello world!\n\" ) ; "
"swprintf ( dst , \"Hello!\n\" ) ; "
"snwprintf ( dst , sizeof ( dst ) / sizeof ( unsigned short ) , \"Hello world!\n\" ) ; "
"wscanf ( \"%s\" , dst ) ; "
"swscanf ( dst , \"%s\" , dst ) ; "
"}";
ASSERT_EQUALS(expected, tokenizeAndStringify(code, false, true, Settings::Win32W));
}