[seahorse/object-list-bye: 3/4] pgp/uid: Use g_strcmp0 for string comparison
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/object-list-bye: 3/4] pgp/uid: Use g_strcmp0 for string comparison
- Date: Mon, 22 Feb 2021 17:34:46 +0000 (UTC)
commit 42b912cb8b54c90bc76f5dbee181475f32998491
Author: Niels De Graef <nielsdegraef gmail com>
Date: Mon Feb 22 18:20:47 2021 +0100
pgp/uid: Use g_strcmp0 for string comparison
pgp/seahorse-gpgme-uid.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/pgp/seahorse-gpgme-uid.c b/pgp/seahorse-gpgme-uid.c
index b5acb425..050f4795 100644
--- a/pgp/seahorse-gpgme-uid.c
+++ b/pgp/seahorse-gpgme-uid.c
@@ -94,16 +94,6 @@ realize_signatures (SeahorseGpgmeUid *self)
}
}
-static gboolean
-compare_strings (const gchar *a, const gchar *b)
-{
- if (a == b)
- return TRUE;
- if (!a || !b)
- return FALSE;
- return g_str_equal (a, b);
-}
-
static gboolean
compare_pubkeys (gpgme_key_t a, gpgme_key_t b)
{
@@ -113,7 +103,7 @@ compare_pubkeys (gpgme_key_t a, gpgme_key_t b)
g_return_val_if_fail (a->subkeys, FALSE);
g_return_val_if_fail (b->subkeys, FALSE);
- return compare_strings (a->subkeys->keyid, b->subkeys->keyid);
+ return g_strcmp0 (a->subkeys->keyid, b->subkeys->keyid) == 0;
}
/* -----------------------------------------------------------------------------
@@ -249,7 +239,7 @@ seahorse_gpgme_uid_is_same (SeahorseGpgmeUid *self, gpgme_user_id_t userid)
g_return_val_if_fail (SEAHORSE_GPGME_IS_UID (self), FALSE);
g_return_val_if_fail (userid, FALSE);
- return compare_strings (self->userid->uid, userid->uid);
+ return g_strcmp0 (self->userid->uid, userid->uid) == 0;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]