Changeset 86311 in vbox

Timestamp:

Sep 28, 2020 10:49:50 AM (4 years ago)

Author:

vboxsync

Message:

xpcom/python: Indentation fixes in py3 changes. bugref:9840

File:

• trunk/src/libs/xpcom18a4/python/src/PyIID.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/python/src/PyIID.cpp

@@ -68 +68 @@
 #else
                 if (PyObject_CheckBuffer(obBuf)) {
-                        void *buf = NULL;
-            Py_buffer view;
-            if (PyObject_GetBuffer(obBuf, &view, PyBUF_CONTIG_RO) != 0)
-            {
-                PyErr_Format(PyExc_ValueError, "Could not get contiguous buffer from object");
-                return NULL;
-            }
-            Py_ssize_t size = view.len;
-            buf = view.buf;
+                        Py_buffer view;
+                        if (PyObject_GetBuffer(obBuf, &view, PyBUF_CONTIG_RO) != 0) {
+                                PyErr_Format(PyExc_ValueError, "Could not get contiguous buffer from object");
+                                return NULL;
+                        }
+                        Py_ssize_t size = view.len;
+                        const void *buf = view.buf;
 #endif
                         if (size != sizeof(nsIID) || buf==NULL) {
-#if PY_MAJOR_VERSION >= 3
-                PyBuffer_Release(&view);
-#endif
+                                PyBuffer_Release(&view);
 #ifdef VBOX
-                PyErr_Format(PyExc_ValueError, "A buffer object to be converted to an IID must be exactly %d bytes long", (int)sizeof(nsIID));
+                                PyErr_Format(PyExc_ValueError, "A buffer object to be converted to an IID must be exactly %d bytes long", (int)sizeof(nsIID));
 #else
                                 PyErr_Format(PyExc_ValueError, "A buffer object to be converted to an IID must be exactly %d bytes long", sizeof(nsIID));
@@ -90 +86 @@
                         }
                         nsIID iid;
-                        unsigned char *ptr = (unsigned char *)buf;
+                        unsigned char const *ptr = (unsigned char const *)buf;
                         iid.m0 = XPT_SWAB32(*((PRUint32 *)ptr));
-                        ptr = ((unsigned char *)buf) + offsetof(nsIID, m1);
+                        ptr = ((unsigned char const *)buf) + offsetof(nsIID, m1);
                         iid.m1 = XPT_SWAB16(*((PRUint16 *)ptr));
-                        ptr = ((unsigned char *)buf) + offsetof(nsIID, m2);
+                        ptr = ((unsigned char const *)buf) + offsetof(nsIID, m2);
                         iid.m2 = XPT_SWAB16(*((PRUint16 *)ptr));
-                        ptr = ((unsigned char *)buf) + offsetof(nsIID, m3);
+                        ptr = ((unsigned char const *)buf) + offsetof(nsIID, m3);
                         for (int i=0;i<8;i++) {
-                                iid.m3[i] = *((PRUint8 *)ptr);
+                                iid.m3[i] = *((PRUint8 const *)ptr);
                                 ptr += sizeof(PRUint8);
                         }
 #if PY_MAJOR_VERSION >= 3
-            PyBuffer_Release(&view);
+                        PyBuffer_Release(&view);
 #endif
                         return new Py_nsIID(iid);