From ffce4908ef35837e28af771ffca30900573a17b2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 23 Apr 2021 10:13:29 +0530 Subject: [PATCH] ... --- .../devices/mtp/windows/content_enumeration.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/devices/mtp/windows/content_enumeration.cpp b/src/calibre/devices/mtp/windows/content_enumeration.cpp index 6388548a24..f275c70361 100644 --- a/src/calibre/devices/mtp/windows/content_enumeration.cpp +++ b/src/calibre/devices/mtp/windows/content_enumeration.cpp @@ -162,13 +162,13 @@ private: void do_one_object(CComPtr &properties) { com_wchar_raii property; if (!SUCCEEDED(properties->GetStringValue(WPD_OBJECT_ID, property.unsafe_address()))) return; - pyobject_raii temp(PyUnicode_FromWideChar(property.ptr(), -1)); - if (!temp) { PyErr_Clear(); return; } - pyobject_raii obj(PyDict_GetItem(this->items, temp.ptr())); + pyobject_raii object_id(PyUnicode_FromWideChar(property.ptr(), -1)); + if (!object_id) { PyErr_Clear(); return; } + pyobject_raii obj(PyDict_GetItem(this->items, object_id.ptr())); if (!obj) { - obj.attach(Py_BuildValue("{s:O}", "id", temp.ptr())); + obj.attach(Py_BuildValue("{s:O}", "id", object_id.ptr())); if (!obj) { PyErr_Clear(); return; } - if (PyDict_SetItem(this->items, temp.ptr(), obj.ptr()) != 0) { PyErr_Clear(); return; } + if (PyDict_SetItem(this->items, object_id.ptr(), obj.ptr()) != 0) { PyErr_Clear(); return; } } else Py_INCREF(obj.ptr()); set_properties(obj.ptr(), properties); pyobject_raii r(PyObject_CallFunction(callback, "OI", obj.ptr(), this->level));