Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup some warnings from clang

Browse Source
This commit is contained in:
Kovid Goyal 2023-01-27 15:59:12 +05:30
parent e2a8bab98a
commit 9b4f63c100
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/utils/windows/winutil.cpp
View File

@ -311,7 +311,7 @@ known_folder_path(PyObject *self, PyObject *args) {
DWORD flags = KF_FLAG_DEFAULT; DWORD flags = KF_FLAG_DEFAULT;
if (!PyArg_ParseTuple(args, "O!|k", &PyGUIDType, &id, &flags)) return NULL; if (!PyArg_ParseTuple(args, "O!|k", &PyGUIDType, &id, &flags)) return NULL;
com_wchar_raii path; com_wchar_raii path;
HRESULT hr = SHGetKnownFolderPath(id->guid, flags, NULL, path.unsafe_address()); SHGetKnownFolderPath(id->guid, flags, NULL, path.unsafe_address());
return PyUnicode_FromWideChar(path.ptr(), -1); return PyUnicode_FromWideChar(path.ptr(), -1);
} }
@ -473,7 +473,7 @@ static PyObject*
winutil_get_file_size(PyObject *self, PyObject *args) { winutil_get_file_size(PyObject *self, PyObject *args) {
HANDLE handle; HANDLE handle;
if (!PyArg_ParseTuple(args, "O&", convert_handle, &handle)) return NULL; if (!PyArg_ParseTuple(args, "O&", convert_handle, &handle)) return NULL;
LARGE_INTEGER ans = {0}; LARGE_INTEGER ans = {{0}};
if (!GetFileSizeEx(handle, &ans)) return set_error_from_handle(args); if (!GetFileSizeEx(handle, &ans)) return set_error_from_handle(args);
return PyLong_FromLongLong(ans.QuadPart); return PyLong_FromLongLong(ans.QuadPart);
} }
@ -482,9 +482,9 @@ static PyObject*
winutil_set_file_pointer(PyObject *self, PyObject *args) { winutil_set_file_pointer(PyObject *self, PyObject *args) {
unsigned long move_method = FILE_BEGIN; unsigned long move_method = FILE_BEGIN;
HANDLE handle; HANDLE handle;
LARGE_INTEGER pos = {0}; LARGE_INTEGER pos = {{0}};
if (!PyArg_ParseTuple(args, "O&L|k", convert_handle, &handle, &pos.QuadPart, &move_method)) return NULL; if (!PyArg_ParseTuple(args, "O&L|k", convert_handle, &handle, &pos.QuadPart, &move_method)) return NULL;
LARGE_INTEGER ans = {0}; LARGE_INTEGER ans = {{0}};
if (!SetFilePointerEx(handle, pos, &ans, move_method)) return set_error_from_handle(args); if (!SetFilePointerEx(handle, pos, &ans, move_method)) return set_error_from_handle(args);
return PyLong_FromLongLong(ans.QuadPart); return PyLong_FromLongLong(ans.QuadPart);
} }
@ -1019,7 +1019,6 @@ EnumResProc(HMODULE handle, LPWSTR type, LPWSTR name, ResourceData *data) {
static const wchar_t* static const wchar_t*
get_resource_id_for_index(HMODULE handle, const int index, LPCWSTR type = RT_GROUP_ICON) { get_resource_id_for_index(HMODULE handle, const int index, LPCWSTR type = RT_GROUP_ICON) {
ResourceData data = {index, NULL}; ResourceData data = {index, NULL};
int count = index;
EnumResourceNamesW(handle, type, reinterpret_cast<ENUMRESNAMEPROC>(EnumResProc), reinterpret_cast<LONG_PTR>(&data)); EnumResourceNamesW(handle, type, reinterpret_cast<ENUMRESNAMEPROC>(EnumResProc), reinterpret_cast<LONG_PTR>(&data));
return data.resource_id; return data.resource_id;
} }