Skip to content

Commit 6aeaa32

Browse files
committed
aesthetics
1 parent 8533af5 commit 6aeaa32

File tree

1 file changed

+18
-31
lines changed

1 file changed

+18
-31
lines changed

Modules/mmapmodule.c

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,7 @@ _safe_PyBytes_FromStringAndSize(char *start, size_t num_bytes) {
427427
return NULL;
428428
}
429429
else {
430-
PyObject *result = PyBytes_FromStringAndSize(&dest, 1);
431-
return result;
430+
return PyBytes_FromStringAndSize(&dest, 1);
432431
}
433432
}
434433
else {
@@ -456,10 +455,8 @@ mmap_read_byte_method(mmap_object *self,
456455
if (safe_byte_copy(&dest, self->data + self->pos) < 0) {
457456
return NULL;
458457
}
459-
else {
460-
self->pos++;
461-
return PyLong_FromLong((unsigned char) dest);
462-
}
458+
self->pos++;
459+
return PyLong_FromLong((unsigned char) dest);
463460
}
464461

465462
static PyObject *
@@ -646,15 +643,16 @@ mmap_write_method(mmap_object *self,
646643
}
647644

648645
CHECK_VALID_OR_RELEASE(NULL, data);
646+
PyObject *result;
649647
if (safe_memcpy(self->data + self->pos, data.buf, data.len) < 0) {
650-
PyBuffer_Release(&data);
651-
return NULL;
648+
result = NULL;
652649
}
653650
else {
654651
self->pos += data.len;
655-
PyBuffer_Release(&data);
656-
return PyLong_FromSsize_t(data.len);
652+
result = PyLong_FromSsize_t(data.len);
657653
}
654+
PyBuffer_Release(&data);
655+
return result;
658656
}
659657

660658
static PyObject *
@@ -679,10 +677,8 @@ mmap_write_byte_method(mmap_object *self,
679677
if (safe_byte_copy(self->data + self->pos, &value) < 0) {
680678
return NULL;
681679
}
682-
else {
683-
self->pos++;
684-
Py_RETURN_NONE;
685-
}
680+
self->pos++;
681+
Py_RETURN_NONE;
686682
}
687683

688684
static PyObject *
@@ -1221,9 +1217,7 @@ mmap_item(mmap_object *self, Py_ssize_t i)
12211217
if (safe_byte_copy(&dest, self->data + i) < 0) {
12221218
return NULL;
12231219
}
1224-
else {
1225-
return PyBytes_FromStringAndSize(&dest, 1);
1226-
}
1220+
return PyBytes_FromStringAndSize(&dest, 1);
12271221
}
12281222

12291223
static PyObject *
@@ -1247,9 +1241,7 @@ mmap_subscript(mmap_object *self, PyObject *item)
12471241
if (safe_byte_copy(&dest, self->data + i) < 0) {
12481242
return NULL;
12491243
}
1250-
else {
1251-
return PyLong_FromLong(Py_CHARMASK(dest));
1252-
}
1244+
return PyLong_FromLong(Py_CHARMASK(dest));
12531245
}
12541246
else if (PySlice_Check(item)) {
12551247
Py_ssize_t start, stop, step, slicelen;
@@ -1272,12 +1264,11 @@ mmap_subscript(mmap_object *self, PyObject *item)
12721264
return PyErr_NoMemory();
12731265

12741266
if (safe_copy_to_slice(result_buf, self->data, start, step, slicelen) < 0) {
1275-
PyMem_Free(result_buf);
1276-
return NULL;
1267+
result = NULL;
1268+
}
1269+
else {
1270+
result = PyBytes_FromStringAndSize(result_buf, slicelen);
12771271
}
1278-
1279-
result = PyBytes_FromStringAndSize(result_buf,
1280-
slicelen);
12811272
PyMem_Free(result_buf);
12821273
return result;
12831274
}
@@ -1316,9 +1307,7 @@ mmap_ass_item(mmap_object *self, Py_ssize_t i, PyObject *v)
13161307
if (safe_byte_copy(self->data + i, buf) < 0) {
13171308
return -1;
13181309
}
1319-
else {
1320-
return 0;
1321-
}
1310+
return 0;
13221311
}
13231312

13241313
static int
@@ -1367,9 +1356,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
13671356
if (safe_byte_copy(self->data + i, &v_char) < 0) {
13681357
return -1;
13691358
}
1370-
else {
1371-
return 0;
1372-
}
1359+
return 0;
13731360
}
13741361
else if (PySlice_Check(item)) {
13751362
Py_ssize_t start, stop, step, slicelen;

0 commit comments

Comments
 (0)