Skip to content

Commit ff45477

Browse files
Fix CI typing inconsistencies and macOS Clang C11 label extensions
1 parent 6485e05 commit ff45477

5 files changed

Lines changed: 87 additions & 87 deletions

File tree

multidict/_multidict.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ _multidict_extend(MultiDictObject* self, PyObject* arg, PyObject* kwds,
124124
ASSERT_CONSISTENT(self, false);
125125
Py_CLEAR(seq);
126126
return 0;
127-
fail:
127+
fail:;
128128
if (op != Extend) { // Update or Merge
129129
// Cleanup soft-deleted items
130130
md_post_update(self);
@@ -216,7 +216,7 @@ _multidict_clone_fast(mod_state* state, MultiDictObject* self, bool is_ci,
216216
goto done;
217217
}
218218
}
219-
done:
219+
done:;
220220
return ret;
221221
}
222222

@@ -238,7 +238,7 @@ multidict_copy(MultiDictObject* self)
238238
}
239239
ASSERT_CONSISTENT(new_md, false);
240240
return ret;
241-
fail:
241+
fail:;
242242
Py_XDECREF(ret);
243243
return NULL;
244244
}
@@ -403,7 +403,7 @@ multidict_reduce(MultiDictObject* self)
403403
}
404404

405405
result = PyTuple_Pack(2, Py_TYPE(self), args);
406-
ret:
406+
ret:;
407407
Py_XDECREF(args);
408408
Py_XDECREF(items_list);
409409
Py_XDECREF(items);
@@ -618,9 +618,9 @@ multidict_tp_init(MultiDictObject* self, PyObject* args, PyObject* kwds)
618618
goto cs_done;
619619
}
620620
ret = 0;
621-
cs_done:
621+
cs_done:;
622622
Py_END_CRITICAL_SECTION();
623-
done:
623+
done:;
624624
Py_CLEAR(arg);
625625
if (ret == 0) {
626626
ASSERT_CONSISTENT(self, false);
@@ -668,15 +668,15 @@ multidict_extend(MultiDictObject* self, PyObject* args, PyObject* kwds)
668668
failed = 1;
669669
goto cs_done;
670670
}
671-
cs_done:
671+
cs_done:;
672672
Py_END_CRITICAL_SECTION();
673673
Py_CLEAR(arg);
674674
if (failed) {
675675
return NULL;
676676
}
677677
ASSERT_CONSISTENT(self, false);
678678
Py_RETURN_NONE;
679-
fail:
679+
fail:;
680680
Py_CLEAR(arg);
681681
return NULL;
682682
}
@@ -883,15 +883,15 @@ multidict_update(MultiDictObject* self, PyObject* args, PyObject* kwds)
883883
failed = 1;
884884
goto cs_done;
885885
}
886-
cs_done:
886+
cs_done:;
887887
Py_END_CRITICAL_SECTION();
888888
Py_CLEAR(arg);
889889
if (failed) {
890890
return NULL;
891891
}
892892
ASSERT_CONSISTENT(self, false);
893893
Py_RETURN_NONE;
894-
fail:
894+
fail:;
895895
Py_CLEAR(arg);
896896
return NULL;
897897
}
@@ -915,15 +915,15 @@ multidict_merge(MultiDictObject* self, PyObject* args, PyObject* kwds)
915915
failed = 1;
916916
goto cs_done;
917917
}
918-
cs_done:
918+
cs_done:;
919919
Py_END_CRITICAL_SECTION();
920920
Py_CLEAR(arg);
921921
if (failed) {
922922
return NULL;
923923
}
924924
ASSERT_CONSISTENT(self, false);
925925
Py_RETURN_NONE;
926-
fail:
926+
fail:;
927927
Py_CLEAR(arg);
928928
return NULL;
929929
}
@@ -1139,9 +1139,9 @@ cimultidict_tp_init(MultiDictObject* self, PyObject* args, PyObject* kwds)
11391139
goto cs_done;
11401140
}
11411141
ret = 0;
1142-
cs_done:
1142+
cs_done:;
11431143
Py_END_CRITICAL_SECTION();
1144-
done:
1144+
done:;
11451145
Py_CLEAR(arg);
11461146
if (ret == 0) {
11471147
ASSERT_CONSISTENT(self, false);
@@ -1187,7 +1187,7 @@ multidict_proxy_tp_init(MultiDictProxyObject* self, PyObject* args,
11871187
if (arg == NULL) {
11881188
PyErr_Format(
11891189
PyExc_TypeError,
1190-
"__init__() missing 1 required positional argument: 'arg'");
1190+
"__init__() missing 1 required positional argument:; 'arg'");
11911191
return -1;
11921192
}
11931193
if (kwds != NULL) {
@@ -1472,7 +1472,7 @@ cimultidict_proxy_tp_init(MultiDictProxyObject* self, PyObject* args,
14721472
if (arg == NULL) {
14731473
PyErr_Format(
14741474
PyExc_TypeError,
1475-
"__init__() missing 1 required positional argument: 'arg'");
1475+
"__init__() missing 1 required positional argument:; 'arg'");
14761476
return -1;
14771477
}
14781478
if (kwds != NULL) {
@@ -1713,7 +1713,7 @@ module_exec(PyObject* mod)
17131713
}
17141714

17151715
return 0;
1716-
fail:
1716+
fail:;
17171717
Py_CLEAR(tpl);
17181718
return -1;
17191719
}

0 commit comments

Comments
 (0)