Fix GCC warnings

GrieferAtWork · Dec 8, 2024 · 290a024 · 290a024
1 parent 005db8f
commit 290a024
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/src/deemon/execute/function-wrappers.c b/src/deemon/execute/function-wrappers.c
@@ -4446,7 +4446,7 @@ FrameSymbolsByName_TryName2LocId(FrameSymbolsByName *self,
 	return (canonical_lid_t)-1;
 }
 
-PRIVATE WUNUSED NONNULL((1, 2)) canonical_lid_t DCALL
+PRIVATE WUNUSED NONNULL((1)) canonical_lid_t DCALL
 FrameSymbolsByName_TryVerifyLocId(FrameSymbolsByName *self, size_t ulid) {
 	/* Check that "lid" can appear in "self" */
 	canonical_lid_t size;
@@ -4475,7 +4475,7 @@ FrameSymbolsByName_TryVerifyLocId(FrameSymbolsByName *self, size_t ulid) {
 	return (canonical_lid_t)-2;
 }
 
-PRIVATE WUNUSED NONNULL((1, 2)) canonical_lid_t DCALL
+PRIVATE WUNUSED NONNULL((1)) canonical_lid_t DCALL
 FrameSymbolsByName_VerifyLocId(FrameSymbolsByName *self, size_t lid) {
 	canonical_lid_t result;
 	result = FrameSymbolsByName_TryVerifyLocId(self, lid);

diff --git a/src/deemon/objects/rodict.c b/src/deemon/objects/rodict.c
@@ -992,19 +992,6 @@ rodict_trygetitem_string_len_hash(DeeRoDictObject *__restrict self,
 	return ITER_DONE;
 }
 
-PRIVATE struct type_nsi tpconst rodict_nsi = {
-	/* .nsi_class   = */ TYPE_SEQX_CLASS_MAP,
-	/* .nsi_flags   = */ TYPE_SEQX_FNORMAL,
-	{
-		/* .nsi_maplike = */ {
-			/* .nsi_getsize    = */ (dfunptr_t)&rodict_size,
-			/* .nsi_nextkey    = */ (dfunptr_t)&rodictiterator_nextkey,
-			/* .nsi_nextvalue  = */ (dfunptr_t)&rodictiterator_nextvalue,
-		}
-	}
-};
-
-
 PRIVATE struct type_seq rodict_seq = {
 	/* .tp_iter                         = */ (DREF DeeObject *(DCALL *)(DeeObject *__restrict))&rodict_iter,
 	/* .tp_sizeob                       = */ NULL,

diff --git a/src/deemon/objects/seq/unique-iterator.c b/src/deemon/objects/seq/unique-iterator.c
@@ -361,7 +361,7 @@ INTERN DeeTypeObject UniqueIteratorWithKey_Type = {
 	/* .tp_with          = */ NULL,
 	/* .tp_buffer        = */ NULL,
 	/* .tp_methods       = */ NULL,
-	/* .tp_getsets       = */ NULL, /* TODO: "__encountered__->?DSet" (using a custom wrapper object) */
+	/* .tp_getsets       = */ uqiwk_getsets,
 	/* .tp_members       = */ uqiwk_members,
 	/* .tp_class_methods = */ NULL,
 	/* .tp_class_getsets = */ NULL,

diff --git a/src/deemon/runtime/runtime_error.c b/src/deemon/runtime/runtime_error.c
@@ -314,7 +314,7 @@ INTERN ATTR_COLD NONNULL((1, 2)) int
 	                       key, Dee_TYPE(self), self);
 }
 
-INTERN ATTR_COLD NONNULL((1, 2)) int
+INTERN ATTR_COLD NONNULL((1)) int
 (DCALL err_unbound_key_int)(DeeObject *self, size_t key) {
 	ASSERT_OBJECT(self);
 	return DeeError_Throwf(&DeeError_UnboundItem,