[gcr/main: 14/38] gcr-simple-certificate: Use a GBytes internally
- From: Corentin Noël <corentinnoel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcr/main: 14/38] gcr-simple-certificate: Use a GBytes internally
- Date: Fri, 8 Apr 2022 22:45:31 +0000 (UTC)
commit ab94a01bbbcb90b360e1892e1e0153d1724a8028
Author: Corentin Noël <corentin noel collabora com>
Date: Tue Dec 7 12:22:53 2021 +0100
gcr-simple-certificate: Use a GBytes internally
Makes the code simpler.
gcr/gcr-simple-certificate.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
---
diff --git a/gcr/gcr-simple-certificate.c b/gcr/gcr-simple-certificate.c
index 0331a3b9..59bf633a 100644
--- a/gcr/gcr-simple-certificate.c
+++ b/gcr/gcr-simple-certificate.c
@@ -37,9 +37,7 @@
*/
struct _GcrSimpleCertificatePrivate {
- const guchar *data;
- gsize n_data;
- guchar *owned;
+ GBytes *bytes;
};
/* Forward declarations */
@@ -66,10 +64,7 @@ gcr_simple_certificate_real_finalize (GObject *obj)
{
GcrSimpleCertificate *self = GCR_SIMPLE_CERTIFICATE (obj);
- g_free (self->pv->owned);
- self->pv->owned = NULL;
- self->pv->data = NULL;
- self->pv->n_data = 0;
+ g_clear_pointer (&self->pv->bytes, g_bytes_unref);
G_OBJECT_CLASS (gcr_simple_certificate_parent_class)->finalize (obj);
}
@@ -94,11 +89,10 @@ gcr_simple_certificate_get_der_data (GcrCertificate *cert,
g_return_val_if_fail (GCR_IS_CERTIFICATE (self), NULL);
g_return_val_if_fail (n_data, NULL);
- g_return_val_if_fail (self->pv->data, NULL);
+ g_return_val_if_fail (self->pv->bytes, NULL);
/* This is called when we're not a base class */
- *n_data = self->pv->n_data;
- return self->pv->data;
+ return g_bytes_get_data (self->pv->bytes, n_data);
}
static void
@@ -131,9 +125,7 @@ gcr_simple_certificate_new (const guchar *data,
g_return_val_if_fail (n_data, NULL);
cert = g_object_new (GCR_TYPE_SIMPLE_CERTIFICATE, NULL);
-
- cert->pv->data = cert->pv->owned = g_memdup (data, n_data);
- cert->pv->n_data = n_data;
+ cert->pv->bytes = g_bytes_new (data, n_data);
return GCR_CERTIFICATE (cert);
}
@@ -158,9 +150,6 @@ gcr_simple_certificate_new_static (const guchar *data,
g_return_val_if_fail (n_data, NULL);
cert = g_object_new (GCR_TYPE_SIMPLE_CERTIFICATE, NULL);
-
- cert->pv->owned = NULL;
- cert->pv->data = data;
- cert->pv->n_data = n_data;
+ cert->pv->bytes = g_bytes_new_static (data, n_data);
return GCR_CERTIFICATE (cert);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]