Code review

walbourn · walbourn · commit fb1739fd5f0b · 2024-09-16T21:31:04.000-07:00
diff --git a/Common/CmdLineHelpers.h b/Common/CmdLineHelpers.h
@@ -13,6 +13,17 @@
 #error Requires C++17 (and /Zc:__cplusplus with MSVC)
 #endif
 
+#include <algorithm>
+#include <cstdio>
+#include <cwchar>
+#include <filesystem>
+#include <fstream>
+#include <list>
+#include <memory>
+#include <set>
+#include <string>
+
+
 namespace Helpers
 {
     inline HANDLE safe_handle(HANDLE h) noexcept { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }
@@ -39,7 +50,7 @@ namespace Helpers
     };
 
     template<typename T>
-    T LookupByName(const wchar_t *pName, const SValue<T> *pArray)
+    T LookupByName(const wchar_t _In_z_ *pName, const SValue<T> *pArray)
     {
         while (pArray->name)
         {
@@ -167,7 +178,7 @@ namespace Helpers
         }
     }
 
-    void SearchForFiles(const std::filesystem::path& path, std::list<SConversion>& files, bool recursive, const wchar_t* folder)
+    void SearchForFiles(const std::filesystem::path& path, std::list<SConversion>& files, bool recursive, _In_opt_z_ const wchar_t* folder)
     {
         // Process files
         WIN32_FIND_DATAW findData = {};
@@ -342,7 +353,7 @@ namespace Helpers
             if (errorText)
                 LocalFree(errorText);
 
-            for (wchar_t* ptr = desc; *ptr != 0; ++ptr)
+            for(wchar_t* ptr = desc; *ptr != 0; ++ptr)
             {
                 if (*ptr == L'\r' || *ptr == L'\n')
                 {
diff --git a/Texassemble/texassemble.cpp b/Texassemble/texassemble.cpp
@@ -44,7 +44,6 @@
 #include <locale>
 #include <memory>
 #include <new>
-#include <set>
 #include <string>
 #include <tuple>
 #include <utility>
diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp
@@ -45,7 +45,6 @@
 #include <locale>
 #include <memory>
 #include <new>
-#include <set>
 #include <string>
 #include <tuple>
 
diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp
@@ -44,7 +44,6 @@
 #include <locale>
 #include <memory>
 #include <new>
-#include <set>
 #include <string>
 #include <tuple>
 #include <vector>

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,17 @@`
`13`	`13`	`#error Requires C++17 (and /Zc:__cplusplus with MSVC)`
`14`	`14`	`#endif`
`15`	`15`
	`16`	`+#include <algorithm>`
	`17`	`+#include <cstdio>`
	`18`	`+#include <cwchar>`
	`19`	`+#include <filesystem>`
	`20`	`+#include <fstream>`
	`21`	`+#include <list>`
	`22`	`+#include <memory>`
	`23`	`+#include <set>`
	`24`	`+#include <string>`
	`25`	`+`
	`26`	`+`
`16`	`27`	`namespace Helpers`
`17`	`28`	`{`
`18`	`29`	`inline HANDLE safe_handle(HANDLE h) noexcept { return (h == INVALID_HANDLE_VALUE) ? nullptr : h; }`
`@@ -39,7 +50,7 @@ namespace Helpers`
`39`	`50`	`};`
`40`	`51`
`41`	`52`	`template<typename T>`
`42`		`- T LookupByName(const wchar_t pName, const SValue<T> pArray)`
	`53`	`+ T LookupByName(const wchar_t _In_z_ pName, const SValue<T> pArray)`
`43`	`54`	`{`
`44`	`55`	`while (pArray->name)`
`45`	`56`	`{`
`@@ -167,7 +178,7 @@ namespace Helpers`
`167`	`178`	`}`
`168`	`179`	`}`
`169`	`180`
`170`		`- void SearchForFiles(const std::filesystem::path& path, std::list<SConversion>& files, bool recursive, const wchar_t* folder)`
	`181`	`+ void SearchForFiles(const std::filesystem::path& path, std::list<SConversion>& files, bool recursive, _In_opt_z_ const wchar_t* folder)`
`171`	`182`	`{`
`172`	`183`	`// Process files`
`173`	`184`	`WIN32_FIND_DATAW findData = {};`
`@@ -342,7 +353,7 @@ namespace Helpers`
`342`	`353`	`if (errorText)`
`343`	`354`	`LocalFree(errorText);`
`344`	`355`
`345`		`- for (wchar_t* ptr = desc; *ptr != 0; ++ptr)`
	`356`	`+ for(wchar_t* ptr = desc; *ptr != 0; ++ptr)`
`346`	`357`	`{`
`347`	`358`	`if (ptr == L'\r' \|\| ptr == L'\n')`
`348`	`359`	`{`