Skip to content

Commit 3790216

Browse files
committed
Improve formatting of struct def and initialization
1 parent 78ad46f commit 3790216

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

extension/maxminddb.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@ static PyTypeObject Reader_Type;
1212
static PyTypeObject Metadata_Type;
1313
static PyObject *MaxMindDB_error;
1414

15+
// clang-format off
1516
typedef struct {
1617
PyObject_HEAD /* no semicolon */
17-
MMDB_s *mmdb;
18+
MMDB_s *mmdb;
1819
PyObject *closed;
1920
} Reader_obj;
2021

2122
typedef struct {
2223
PyObject_HEAD /* no semicolon */
23-
PyObject *binary_format_major_version;
24+
PyObject *binary_format_major_version;
2425
PyObject *binary_format_minor_version;
2526
PyObject *build_epoch;
2627
PyObject *database_type;
@@ -30,6 +31,7 @@ typedef struct {
3031
PyObject *node_count;
3132
PyObject *record_size;
3233
} Metadata_obj;
34+
// clang-format on
3335

3436
static int get_record(PyObject *self, PyObject *args, PyObject **record);
3537
static bool format_sockaddr(struct sockaddr *addr, char *dst);
@@ -622,8 +624,10 @@ static PyMemberDef Reader_members[] = {
622624
{"closed", T_OBJECT, offsetof(Reader_obj, closed), READONLY, NULL},
623625
{NULL, 0, 0, 0, NULL}};
624626

627+
// clang-format off
625628
static PyTypeObject Reader_Type = {
626-
PyVarObject_HEAD_INIT(NULL, 0).tp_basicsize = sizeof(Reader_obj),
629+
PyVarObject_HEAD_INIT(NULL, 0)
630+
.tp_basicsize = sizeof(Reader_obj),
627631
.tp_dealloc = Reader_dealloc,
628632
.tp_doc = "Reader object",
629633
.tp_flags = Py_TPFLAGS_DEFAULT,
@@ -632,10 +636,10 @@ static PyTypeObject Reader_Type = {
632636
.tp_name = "Reader",
633637
.tp_init = Reader_init,
634638
};
639+
// clang-format on
635640

636641
static PyMethodDef Metadata_methods[] = {{NULL, NULL, 0, NULL}};
637642

638-
/* *INDENT-OFF* */
639643
static PyMemberDef Metadata_members[] = {
640644
{"binary_format_major_version",
641645
T_OBJECT,
@@ -679,17 +683,19 @@ static PyMemberDef Metadata_members[] = {
679683
READONLY,
680684
NULL},
681685
{NULL, 0, 0, 0, NULL}};
682-
/* *INDENT-ON* */
683686

687+
// clang-format off
684688
static PyTypeObject Metadata_Type = {
685-
PyVarObject_HEAD_INIT(NULL, 0).tp_basicsize = sizeof(Metadata_obj),
689+
PyVarObject_HEAD_INIT(NULL, 0)
690+
.tp_basicsize = sizeof(Metadata_obj),
686691
.tp_dealloc = Metadata_dealloc,
687692
.tp_doc = "Metadata object",
688693
.tp_flags = Py_TPFLAGS_DEFAULT,
689694
.tp_members = Metadata_members,
690695
.tp_methods = Metadata_methods,
691696
.tp_name = "Metadata",
692697
.tp_init = Metadata_init};
698+
// clang-format on
693699

694700
static PyMethodDef MaxMindDB_methods[] = {{NULL, NULL, 0, NULL}};
695701

0 commit comments

Comments
 (0)