Minor code review

walbourn · walbourn · commit af8ae93f3537 · 2024-10-26T11:49:13.000-07:00
diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp
@@ -1097,8 +1097,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                 maxVolume = LookupByName(pValue, g_pFeatureLevelsVolume);
                 if (!maxSize || !maxCube || !maxArray || !maxVolume)
                 {
-                    wprintf(L"Invalid value specified with -fl (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -fl (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp
@@ -1412,8 +1412,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
             case OPT_WIDTH:
                 if (swscanf_s(pValue, L"%zu", &width) != 1)
                 {
-                    wprintf(L"Invalid value specified with -w (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -w (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
@@ -1432,8 +1431,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
             case OPT_MIPLEVELS:
                 if (swscanf_s(pValue, L"%zu", &mipLevels) != 1)
                 {
-                    wprintf(L"Invalid value specified with -m (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -m (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
@@ -1459,8 +1457,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                             break;
 
                         default:
-                            wprintf(L"Invalid value specified with -f (%ls)\n", pValue);
-                            wprintf(L"\n");
+                            wprintf(L"Invalid value specified with -f (%ls)\n\n", pValue);
                             PrintUsage();
                             return 1;
                         }
@@ -1472,8 +1469,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                 dwFilter = static_cast<TEX_FILTER_FLAGS>(LookupByName(pValue, g_pFilters));
                 if (!dwFilter)
                 {
-                    wprintf(L"Invalid value specified with -if (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -if (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
@@ -1483,8 +1479,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                 dwRotateColor = LookupByName(pValue, g_pRotateColor);
                 if (!dwRotateColor)
                 {
-                    wprintf(L"Invalid value specified with -rotatecolor (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -rotatecolor (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
@@ -1529,8 +1524,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                 FileType = LookupByName(pValue, g_pSaveFileTypes);
                 if (!FileType)
                 {
-                    wprintf(L"Invalid value specified with -ft (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -ft (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
@@ -1671,8 +1665,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                 maxSize = LookupByName(pValue, g_pFeatureLevels);
                 if (!maxSize)
                 {
-                    wprintf(L"Invalid value specified with -fl (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -fl (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
@@ -1681,31 +1674,27 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
             case OPT_ALPHA_THRESHOLD:
                 if (swscanf_s(pValue, L"%f", &alphaThreshold) != 1)
                 {
-                    wprintf(L"Invalid value specified with -at (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -at (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
                 else if (alphaThreshold < 0.f)
                 {
-                    wprintf(L"-at (%ls) parameter must be positive\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"-at (%ls) parameter must be positive\n\n", pValue);
                     return 1;
                 }
                 break;
 
             case OPT_ALPHA_WEIGHT:
                 if (swscanf_s(pValue, L"%f", &alphaWeight) != 1)
                 {
-                    wprintf(L"Invalid value specified with -aw (%ls)\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"Invalid value specified with -aw (%ls)\n\n", pValue);
                     PrintUsage();
                     return 1;
                 }
                 else if (alphaWeight < 0.f)
                 {
-                    wprintf(L"-aw (%ls) parameter must be positive\n", pValue);
-                    wprintf(L"\n");
+                    wprintf(L"-aw (%ls) parameter must be positive\n\n", pValue);
                     return 1;
                 }
                 break;
diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp
@@ -3263,8 +3263,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                     fileType = LookupByName(pValue, g_pDumpFileTypes);
                     if (!fileType)
                     {
-                        wprintf(L"Invalid value specified with -ft (%ls)\n", pValue);
-                        wprintf(L"\n");
+                        wprintf(L"Invalid value specified with -ft (%ls)\n\n", pValue);
                         PrintUsage();
                         return 1;
                     }

Original file line number	Diff line number	Diff line change
`@@ -1097,8 +1097,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1097`	`1097`	`maxVolume = LookupByName(pValue, g_pFeatureLevelsVolume);`
`1098`	`1098`	`if (!maxSize \|\| !maxCube \|\| !maxArray \|\| !maxVolume)`
`1099`	`1099`	`{`
`1100`		`- wprintf(L"Invalid value specified with -fl (%ls)\n", pValue);`
`1101`		`- wprintf(L"\n");`
	`1100`	`+ wprintf(L"Invalid value specified with -fl (%ls)\n\n", pValue);`
`1102`	`1101`	`PrintUsage();`
`1103`	`1102`	`return 1;`
`1104`	`1103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1412,8 +1412,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1412`	`1412`	`case OPT_WIDTH:`
`1413`	`1413`	`if (swscanf_s(pValue, L"%zu", &width) != 1)`
`1414`	`1414`	`{`
`1415`		`- wprintf(L"Invalid value specified with -w (%ls)\n", pValue);`
`1416`		`- wprintf(L"\n");`
	`1415`	`+ wprintf(L"Invalid value specified with -w (%ls)\n\n", pValue);`
`1417`	`1416`	`PrintUsage();`
`1418`	`1417`	`return 1;`
`1419`	`1418`	`}`
`@@ -1432,8 +1431,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1432`	`1431`	`case OPT_MIPLEVELS:`
`1433`	`1432`	`if (swscanf_s(pValue, L"%zu", &mipLevels) != 1)`
`1434`	`1433`	`{`
`1435`		`- wprintf(L"Invalid value specified with -m (%ls)\n", pValue);`
`1436`		`- wprintf(L"\n");`
	`1434`	`+ wprintf(L"Invalid value specified with -m (%ls)\n\n", pValue);`
`1437`	`1435`	`PrintUsage();`
`1438`	`1436`	`return 1;`
`1439`	`1437`	`}`
`@@ -1459,8 +1457,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1459`	`1457`	`break;`
`1460`	`1458`
`1461`	`1459`	`default:`
`1462`		`- wprintf(L"Invalid value specified with -f (%ls)\n", pValue);`
`1463`		`- wprintf(L"\n");`
	`1460`	`+ wprintf(L"Invalid value specified with -f (%ls)\n\n", pValue);`
`1464`	`1461`	`PrintUsage();`
`1465`	`1462`	`return 1;`
`1466`	`1463`	`}`
`@@ -1472,8 +1469,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1472`	`1469`	`dwFilter = static_cast<TEX_FILTER_FLAGS>(LookupByName(pValue, g_pFilters));`
`1473`	`1470`	`if (!dwFilter)`
`1474`	`1471`	`{`
`1475`		`- wprintf(L"Invalid value specified with -if (%ls)\n", pValue);`
`1476`		`- wprintf(L"\n");`
	`1472`	`+ wprintf(L"Invalid value specified with -if (%ls)\n\n", pValue);`
`1477`	`1473`	`PrintUsage();`
`1478`	`1474`	`return 1;`
`1479`	`1475`	`}`
`@@ -1483,8 +1479,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1483`	`1479`	`dwRotateColor = LookupByName(pValue, g_pRotateColor);`
`1484`	`1480`	`if (!dwRotateColor)`
`1485`	`1481`	`{`
`1486`		`- wprintf(L"Invalid value specified with -rotatecolor (%ls)\n", pValue);`
`1487`		`- wprintf(L"\n");`
	`1482`	`+ wprintf(L"Invalid value specified with -rotatecolor (%ls)\n\n", pValue);`
`1488`	`1483`	`PrintUsage();`
`1489`	`1484`	`return 1;`
`1490`	`1485`	`}`
`@@ -1529,8 +1524,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1529`	`1524`	`FileType = LookupByName(pValue, g_pSaveFileTypes);`
`1530`	`1525`	`if (!FileType)`
`1531`	`1526`	`{`
`1532`		`- wprintf(L"Invalid value specified with -ft (%ls)\n", pValue);`
`1533`		`- wprintf(L"\n");`
	`1527`	`+ wprintf(L"Invalid value specified with -ft (%ls)\n\n", pValue);`
`1534`	`1528`	`PrintUsage();`
`1535`	`1529`	`return 1;`
`1536`	`1530`	`}`
`@@ -1671,8 +1665,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1671`	`1665`	`maxSize = LookupByName(pValue, g_pFeatureLevels);`
`1672`	`1666`	`if (!maxSize)`
`1673`	`1667`	`{`
`1674`		`- wprintf(L"Invalid value specified with -fl (%ls)\n", pValue);`
`1675`		`- wprintf(L"\n");`
	`1668`	`+ wprintf(L"Invalid value specified with -fl (%ls)\n\n", pValue);`
`1676`	`1669`	`PrintUsage();`
`1677`	`1670`	`return 1;`
`1678`	`1671`	`}`
`@@ -1681,31 +1674,27 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`1681`	`1674`	`case OPT_ALPHA_THRESHOLD:`
`1682`	`1675`	`if (swscanf_s(pValue, L"%f", &alphaThreshold) != 1)`
`1683`	`1676`	`{`
`1684`		`- wprintf(L"Invalid value specified with -at (%ls)\n", pValue);`
`1685`		`- wprintf(L"\n");`
	`1677`	`+ wprintf(L"Invalid value specified with -at (%ls)\n\n", pValue);`
`1686`	`1678`	`PrintUsage();`
`1687`	`1679`	`return 1;`
`1688`	`1680`	`}`
`1689`	`1681`	`else if (alphaThreshold < 0.f)`
`1690`	`1682`	`{`
`1691`		`- wprintf(L"-at (%ls) parameter must be positive\n", pValue);`
`1692`		`- wprintf(L"\n");`
	`1683`	`+ wprintf(L"-at (%ls) parameter must be positive\n\n", pValue);`
`1693`	`1684`	`return 1;`
`1694`	`1685`	`}`
`1695`	`1686`	`break;`
`1696`	`1687`
`1697`	`1688`	`case OPT_ALPHA_WEIGHT:`
`1698`	`1689`	`if (swscanf_s(pValue, L"%f", &alphaWeight) != 1)`
`1699`	`1690`	`{`
`1700`		`- wprintf(L"Invalid value specified with -aw (%ls)\n", pValue);`
`1701`		`- wprintf(L"\n");`
	`1691`	`+ wprintf(L"Invalid value specified with -aw (%ls)\n\n", pValue);`
`1702`	`1692`	`PrintUsage();`
`1703`	`1693`	`return 1;`
`1704`	`1694`	`}`
`1705`	`1695`	`else if (alphaWeight < 0.f)`
`1706`	`1696`	`{`
`1707`		`- wprintf(L"-aw (%ls) parameter must be positive\n", pValue);`
`1708`		`- wprintf(L"\n");`
	`1697`	`+ wprintf(L"-aw (%ls) parameter must be positive\n\n", pValue);`
`1709`	`1698`	`return 1;`
`1710`	`1699`	`}`
`1711`	`1700`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -3263,8 +3263,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`3263`	`3263`	`fileType = LookupByName(pValue, g_pDumpFileTypes);`
`3264`	`3264`	`if (!fileType)`
`3265`	`3265`	`{`
`3266`		`- wprintf(L"Invalid value specified with -ft (%ls)\n", pValue);`
`3267`		`- wprintf(L"\n");`
	`3266`	`+ wprintf(L"Invalid value specified with -ft (%ls)\n\n", pValue);`
`3268`	`3267`	`PrintUsage();`
`3269`	`3268`	`return 1;`
`3270`	`3269`	`}`