From 2e125090810014fa46cd9bb27b2e4daea32ba2f4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 17 Feb 2019 23:04:21 +0300 Subject: MIME types are of type char, not wchar_t --- src/mir_app/src/proto_utils.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp index 9e575e3d00..12d6ac1202 100644 --- a/src/mir_app/src/proto_utils.cpp +++ b/src/mir_app/src/proto_utils.cpp @@ -371,29 +371,29 @@ MIR_APP_DLL(int) ProtoGetAvatarFileFormat(const wchar_t *ptszFileName) ///////////////////////////////////////////////////////////////////////////////////////// // mime type functions -static wchar_t *wszMimeTypes[] = -{ - L"application/octet-stream", // PA_FORMAT_UNKNOWN - L"image/png", // PA_FORMAT_PNG - L"image/jpeg", // PA_FORMAT_JPEG - L"image/icon", // PA_FORMAT_ICON - L"image/bmp", // PA_FORMAT_BMP - L"image/gif", // PA_FORMAT_GIF - L"image/swf", // PA_FORMAT_SWF - L"application/xml" // PA_FORMAT_XML +static char *wszMimeTypes[] = +{ + "application/octet-stream", // PA_FORMAT_UNKNOWN + "image/png", // PA_FORMAT_PNG + "image/jpeg", // PA_FORMAT_JPEG + "image/icon", // PA_FORMAT_ICON + "image/bmp", // PA_FORMAT_BMP + "image/gif", // PA_FORMAT_GIF + "image/swf", // PA_FORMAT_SWF + "application/xml" // PA_FORMAT_XML }; -MIR_APP_DLL(const wchar_t*) ProtoGetAvatarMimeType(int iFileType) +MIR_APP_DLL(const char*) ProtoGetAvatarMimeType(int iFileType) { if (iFileType >= 0 && iFileType < _countof(wszMimeTypes)) return wszMimeTypes[iFileType]; return nullptr; } -MIR_APP_DLL(int) ProtoGetAvatarFormatByMimeType(const wchar_t *pwszMimeType) +MIR_APP_DLL(int) ProtoGetAvatarFormatByMimeType(const char *pwszMimeType) { for (int i = 0; i < _countof(wszMimeTypes); i++) - if (!mir_wstrcmp(pwszMimeType, wszMimeTypes[i])) + if (!mir_strcmp(pwszMimeType, wszMimeTypes[i])) return i; return PA_FORMAT_UNKNOWN; -- cgit v1.2.3