]> granicus.if.org Git - icinga2/commitdiff
Use Unicode functions inside check_swap
authorMichael Insel <michael@insel.email>
Thu, 4 Apr 2019 17:55:07 +0000 (19:55 +0200)
committerMarkus Frosch <markus.frosch@icinga.com>
Fri, 5 Apr 2019 07:24:32 +0000 (09:24 +0200)
This ensures that always Unicode functions are used in check_swap.

plugins/check_swap.cpp

index a095bbbc3980b335ba9fe51a965422f06a3c71fc..4f08e2783047d6e42fb163863278c81575262cd2 100644 (file)
@@ -30,7 +30,7 @@ struct pageFileInfo
 
 static bool l_Debug;
 
-BOOL EnumPageFilesProc(LPVOID pContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCTSTR lpFilename) {
+BOOL EnumPageFilesProc(LPVOID pContext, PENUM_PAGE_FILE_INFORMATION pPageFileInfo, LPCWSTR lpFilename) {
        std::vector<pageFileInfo>* pageFile = static_cast<std::vector<pageFileInfo>*>(pContext);
        SYSTEM_INFO systemInfo;
 
@@ -199,10 +199,10 @@ static int printOutput(printInfoStruct& printInfo)
 
 static int check_swap(printInfoStruct& printInfo)
 {
-       PENUM_PAGE_FILE_CALLBACK pageFileCallback = &EnumPageFilesProc;
+       PENUM_PAGE_FILE_CALLBACKW pageFileCallback = &EnumPageFilesProc;
        std::vector<pageFileInfo> pageFiles;
 
-       if(!EnumPageFiles(pageFileCallback, &pageFiles)) {
+       if(!EnumPageFilesW(pageFileCallback, &pageFiles)) {
                printErrorInfo();
                return 3;
        }