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

Silence various warnings from clang

Browse Source
This commit is contained in:
Kovid Goyal 2023-01-27 17:49:10 +05:30
parent fb95b532bd
commit 55ebdf049f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/calibre/devices/mtp/windows/content_enumeration.cpp
View File

@ -188,7 +188,7 @@ private:
public: public:
GetBulkPropertiesCallback() : items(NULL), subfolders(NULL), level(0), complete(INVALID_HANDLE_VALUE), self_ref(0), callback(NULL) {} GetBulkPropertiesCallback() : items(NULL), subfolders(NULL), level(0), complete(INVALID_HANDLE_VALUE), self_ref(0), callback(NULL) {}
~GetBulkPropertiesCallback() { if (complete != INVALID_HANDLE_VALUE) CloseHandle(complete); complete = INVALID_HANDLE_VALUE; } virtual ~GetBulkPropertiesCallback() { if (complete != INVALID_HANDLE_VALUE) CloseHandle(complete); complete = INVALID_HANDLE_VALUE; }
bool start_processing(PyObject *items, PyObject *subfolders, unsigned int level, PyObject *callback) { bool start_processing(PyObject *items, PyObject *subfolders, unsigned int level, PyObject *callback) {
complete = CreateEvent(NULL, FALSE, FALSE, NULL); complete = CreateEvent(NULL, FALSE, FALSE, NULL);
@ -226,7 +226,7 @@ public:
} }
return hr; return hr;
} }
HRESULT __stdcall GetBulkPropertiesCallback::OnProgress(REFGUID Context, IPortableDeviceValuesCollection* values) { HRESULT __stdcall OnProgress(REFGUID Context, IPortableDeviceValuesCollection* values) {
handle_values(values); handle_values(values);
return S_OK; return S_OK;
} }
@ -420,7 +420,6 @@ static IPortableDeviceValues*
create_object_properties(const wchar_t *parent_id, const wchar_t *name, const GUID content_type, unsigned PY_LONG_LONG size) { // {{{ create_object_properties(const wchar_t *parent_id, const wchar_t *name, const GUID content_type, unsigned PY_LONG_LONG size) { // {{{
CComPtr<IPortableDeviceValues> values; CComPtr<IPortableDeviceValues> values;
HRESULT hr; HRESULT hr;
bool ok = false;
prop_variant timestamp(VT_DATE); prop_variant timestamp(VT_DATE);
SYSTEMTIME systemtime; SYSTEMTIME systemtime;
GetLocalTime(&systemtime); GetLocalTime(&systemtime);
@ -486,7 +485,7 @@ get_files_and_folders(unsigned int level, IPortableDevice *device, CComPtr<IPort
} // }}} } // }}}
PyObject* PyObject*
wpd::get_filesystem(IPortableDevice *device, const wchar_t *storage_id, IPortableDevicePropertiesBulk *bulk_properties, PyObject *callback) { // {{{ get_filesystem(IPortableDevice *device, const wchar_t *storage_id, IPortableDevicePropertiesBulk *bulk_properties, PyObject *callback) { // {{{
CComPtr<IPortableDeviceContent> content; CComPtr<IPortableDeviceContent> content;
HRESULT hr; HRESULT hr;
@ -503,7 +502,7 @@ wpd::get_filesystem(IPortableDevice *device, const wchar_t *storage_id, IPortabl
} // }}} } // }}}
PyObject* PyObject*
wpd::get_file(IPortableDevice *device, const wchar_t *object_id, PyObject *dest, PyObject *callback) { // {{{ get_file(IPortableDevice *device, const wchar_t *object_id, PyObject *dest, PyObject *callback) { // {{{
CComPtr<IPortableDeviceContent> content; CComPtr<IPortableDeviceContent> content;
CComPtr<IPortableDeviceResources> resources; CComPtr<IPortableDeviceResources> resources;
CComPtr<IPortableDeviceProperties> devprops; CComPtr<IPortableDeviceProperties> devprops;
@ -592,7 +591,7 @@ wpd::get_file(IPortableDevice *device, const wchar_t *object_id, PyObject *dest,
} // }}} } // }}}
PyObject* PyObject*
wpd::create_folder(IPortableDevice *device, const wchar_t *parent_id, const wchar_t *name) { // {{{ create_folder(IPortableDevice *device, const wchar_t *parent_id, const wchar_t *name) { // {{{
CComPtr<IPortableDeviceContent> content; CComPtr<IPortableDeviceContent> content;
CComPtr<IPortableDeviceValues> values; CComPtr<IPortableDeviceValues> values;
CComPtr<IPortableDeviceProperties> devprops; CComPtr<IPortableDeviceProperties> devprops;
@ -623,7 +622,7 @@ wpd::create_folder(IPortableDevice *device, const wchar_t *parent_id, const wcha
} // }}} } // }}}
PyObject* PyObject*
wpd::delete_object(IPortableDevice *device, const wchar_t *object_id) { // {{{ delete_object(IPortableDevice *device, const wchar_t *object_id) { // {{{
CComPtr<IPortableDeviceContent> content; CComPtr<IPortableDeviceContent> content;
CComPtr<IPortableDevicePropVariantCollection> object_ids; CComPtr<IPortableDevicePropVariantCollection> object_ids;
HRESULT hr; HRESULT hr;
@ -656,7 +655,7 @@ wpd::delete_object(IPortableDevice *device, const wchar_t *object_id) { // {{{
} // }}} } // }}}
PyObject* PyObject*
wpd::put_file(IPortableDevice *device, const wchar_t *parent_id, const wchar_t *name, PyObject *src, unsigned PY_LONG_LONG size, PyObject *callback) { // {{{ put_file(IPortableDevice *device, const wchar_t *parent_id, const wchar_t *name, PyObject *src, unsigned PY_LONG_LONG size, PyObject *callback) { // {{{
CComPtr<IPortableDeviceContent> content; CComPtr<IPortableDeviceContent> content;
CComPtr<IPortableDeviceValues> values; CComPtr<IPortableDeviceValues> values;
CComPtr<IPortableDeviceProperties> devprops; CComPtr<IPortableDeviceProperties> devprops;

2
src/calibre/devices/mtp/windows/wpd.cpp
View File

@ -120,7 +120,7 @@ wpd_uninit(PyObject *self, PyObject *args) {
// enumerate_devices() {{{ // enumerate_devices() {{{
static PyObject * static PyObject *
wpd_enumerate_devices(PyObject *self, PyObject *args) { wpd_enumerate_devices(PyObject *self, PyObject *args) {
PyObject *refresh = NULL, *ans = NULL, *temp; PyObject *ans = NULL, *temp;
HRESULT hr; HRESULT hr;
DWORD num_of_devices, i; DWORD num_of_devices, i;
PWSTR *pnp_device_ids; PWSTR *pnp_device_ids;