From 452664a82ba3b0d5e40e8e4912749b44d51b9a9d Mon Sep 17 00:00:00 2001 From: Niels De Graef Date: Sun, 5 Mar 2023 01:09:30 +0100 Subject: core: Avoid return_if_fail macro in Vala Vala doesn't really do basic compiler checks on calls to `g_return_*_if_fail()` in Vala code, leading to errors in clang. In these cases, it should be fine to do a hard `assert` instead, since those functions not working would probably lead to a segfault later on anyway. Fixes: https://gitlab.gnome.org/GNOME/gnome-contacts/-/issues/275 --- src/core/contacts-addresses-chunk.vala | 2 +- src/core/contacts-alias-chunk.vala | 2 +- src/core/contacts-avatar-chunk.vala | 2 +- src/core/contacts-birthday-chunk.vala | 2 +- src/core/contacts-email-addresses-chunk.vala | 2 +- src/core/contacts-full-name-chunk.vala | 2 +- src/core/contacts-im-addresses-chunk.vala | 2 +- src/core/contacts-nickname-chunk.vala | 2 +- src/core/contacts-notes-chunk.vala | 2 +- src/core/contacts-phones-chunk.vala | 2 +- src/core/contacts-roles-chunk.vala | 2 +- src/core/contacts-structured-name-chunk.vala | 2 +- src/core/contacts-urls-chunk.vala | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/core/contacts-addresses-chunk.vala b/src/core/contacts-addresses-chunk.vala index a48e1b2..ba90dd7 100644 --- a/src/core/contacts-addresses-chunk.vala +++ b/src/core/contacts-addresses-chunk.vala @@ -27,7 +27,7 @@ public class Contacts.AddressesChunk : BinChunk { construct { if (persona != null) { - return_if_fail (persona is PostalAddressDetails); + assert (persona is PostalAddressDetails); unowned var postal_address_details = (PostalAddressDetails) persona; foreach (var address_field in postal_address_details.postal_addresses) { diff --git a/src/core/contacts-alias-chunk.vala b/src/core/contacts-alias-chunk.vala index 412b538..2e7dd29 100644 --- a/src/core/contacts-alias-chunk.vala +++ b/src/core/contacts-alias-chunk.vala @@ -49,7 +49,7 @@ public class Contacts.AliasChunk : Chunk { construct { if (persona != null) { - return_if_fail (persona is AliasDetails); + assert (persona is AliasDetails); persona.bind_property ("alias", this, "alias"); this._alias = ((AliasDetails) persona).alias; } diff --git a/src/core/contacts-avatar-chunk.vala b/src/core/contacts-avatar-chunk.vala index bf15627..e379854 100644 --- a/src/core/contacts-avatar-chunk.vala +++ b/src/core/contacts-avatar-chunk.vala @@ -43,7 +43,7 @@ public class Contacts.AvatarChunk : Chunk { construct { if (persona != null) { - return_if_fail (persona is AvatarDetails); + assert (persona is AvatarDetails); persona.bind_property ("avatar", this, "avatar"); this._avatar = ((AvatarDetails) persona).avatar; } diff --git a/src/core/contacts-birthday-chunk.vala b/src/core/contacts-birthday-chunk.vala index ef47a4c..c03eccd 100644 --- a/src/core/contacts-birthday-chunk.vala +++ b/src/core/contacts-birthday-chunk.vala @@ -60,7 +60,7 @@ public class Contacts.BirthdayChunk : Chunk { construct { if (persona != null) { - return_if_fail (persona is BirthdayDetails); + assert (persona is BirthdayDetails); persona.bind_property ("birthday", this, "birthday"); this._birthday = ((BirthdayDetails) persona).birthday; } diff --git a/src/core/contacts-email-addresses-chunk.vala b/src/core/contacts-email-addresses-chunk.vala index a03b2c2..73a03f2 100644 --- a/src/core/contacts-email-addresses-chunk.vala +++ b/src/core/contacts-email-addresses-chunk.vala @@ -23,7 +23,7 @@ public class Contacts.EmailAddressesChunk : BinChunk { construct { if (persona != null) { - return_if_fail (persona is EmailDetails); + assert (persona is EmailDetails); unowned var email_details = (EmailDetails) persona; foreach (var email_field in email_details.email_addresses) { diff --git a/src/core/contacts-full-name-chunk.vala b/src/core/contacts-full-name-chunk.vala index bafa424..64bdb5b 100644 --- a/src/core/contacts-full-name-chunk.vala +++ b/src/core/contacts-full-name-chunk.vala @@ -54,7 +54,7 @@ public class Contacts.FullNameChunk : Chunk { construct { if (persona != null) { - return_if_fail (persona is NameDetails); + assert (persona is NameDetails); persona.bind_property ("full-name", this, "full-name"); this._full_name = ((NameDetails) persona).full_name; } diff --git a/src/core/contacts-im-addresses-chunk.vala b/src/core/contacts-im-addresses-chunk.vala index 4d3effb..91c64ab 100644 --- a/src/core/contacts-im-addresses-chunk.vala +++ b/src/core/contacts-im-addresses-chunk.vala @@ -28,7 +28,7 @@ public class Contacts.ImAddressesChunk : BinChunk { construct { if (persona != null) { - return_if_fail (persona is ImDetails); + assert (persona is ImDetails); unowned var im_details = (ImDetails) persona; var iter = im_details.im_addresses.map_iterator (); diff --git a/src/core/contacts-nickname-chunk.vala b/src/core/contacts-nickname-chunk.vala index 5dd7f79..ad58295 100644 --- a/src/core/contacts-nickname-chunk.vala +++ b/src/core/contacts-nickname-chunk.vala @@ -52,7 +52,7 @@ public class Contacts.NicknameChunk : Chunk { construct { if (persona != null) { - return_if_fail (persona is NameDetails); + assert (persona is NameDetails); persona.bind_property ("nickname", this, "nickname"); this._nickname = ((NameDetails) persona).nickname; } diff --git a/src/core/contacts-notes-chunk.vala b/src/core/contacts-notes-chunk.vala index f2b71ca..dcb3b69 100644 --- a/src/core/contacts-notes-chunk.vala +++ b/src/core/contacts-notes-chunk.vala @@ -27,7 +27,7 @@ public class Contacts.NotesChunk : BinChunk { construct { if (persona != null) { - return_if_fail (persona is NoteDetails); + assert (persona is NoteDetails); unowned var note_details = (NoteDetails) persona; foreach (var note_field in note_details.notes) { diff --git a/src/core/contacts-phones-chunk.vala b/src/core/contacts-phones-chunk.vala index 5d8a347..103cfb6 100644 --- a/src/core/contacts-phones-chunk.vala +++ b/src/core/contacts-phones-chunk.vala @@ -27,7 +27,7 @@ public class Contacts.PhonesChunk : BinChunk { construct { if (persona != null) { - return_if_fail (persona is PhoneDetails); + assert (persona is PhoneDetails); unowned var phone_details = (PhoneDetails) persona; foreach (var phone_field in phone_details.phone_numbers) { diff --git a/src/core/contacts-roles-chunk.vala b/src/core/contacts-roles-chunk.vala index 0fa8e4b..b942459 100644 --- a/src/core/contacts-roles-chunk.vala +++ b/src/core/contacts-roles-chunk.vala @@ -28,7 +28,7 @@ public class Contacts.RolesChunk : BinChunk { construct { if (persona != null) { - return_if_fail (persona is RoleDetails); + assert (persona is RoleDetails); unowned var role_details = (RoleDetails) persona; foreach (var role_field in role_details.roles) { diff --git a/src/core/contacts-structured-name-chunk.vala b/src/core/contacts-structured-name-chunk.vala index 96f2888..264898b 100644 --- a/src/core/contacts-structured-name-chunk.vala +++ b/src/core/contacts-structured-name-chunk.vala @@ -59,7 +59,7 @@ public class Contacts.StructuredNameChunk : Chunk { construct { if (persona != null) { - return_if_fail (persona is NameDetails); + assert (persona is NameDetails); persona.bind_property ("structured-name", this, "structured-name"); this._structured_name = ((NameDetails) persona).structured_name; } diff --git a/src/core/contacts-urls-chunk.vala b/src/core/contacts-urls-chunk.vala index 2e927d6..d7239c9 100644 --- a/src/core/contacts-urls-chunk.vala +++ b/src/core/contacts-urls-chunk.vala @@ -27,7 +27,7 @@ public class Contacts.UrlsChunk : BinChunk { construct { if (persona != null) { - return_if_fail (persona is UrlDetails); + assert (persona is UrlDetails); unowned var url_details = (UrlDetails) persona; foreach (var url_field in url_details.urls) { -- cgit v1.2.1