[gnome-keyring/trust-store: 4/7] [gkm] GkmSerializable uses gpointer instead of guchar

[Stefan Walter <stefw src gnome org>]

commit 71ea2e28d1ca8e6bcc8947ecfa2ab890ed47d0cb
Author: Stef Walter <stef memberwebs com>
Date:   Wed Sep 15 22:44:34 2010 +0000

    [gkm] GkmSerializable uses gpointer instead of guchar
    
    No need to use guchar here. Use gpointer instead.

 pkcs11/gkm/gkm-certificate.c                 |    4 ++--
 pkcs11/gkm/gkm-serializable.c                |    4 ++--
 pkcs11/gkm/gkm-serializable.h                |    8 ++++----
 pkcs11/gnome2-store/gkm-gnome2-private-key.c |    4 ++--
 pkcs11/gnome2-store/gkm-gnome2-public-key.c  |    4 ++--
 pkcs11/gnome2-store/gkm-gnome2-storage.c     |    4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/pkcs11/gkm/gkm-certificate.c b/pkcs11/gkm/gkm-certificate.c
index 1dbfb81..3b2a6ae 100644
--- a/pkcs11/gkm/gkm-certificate.c
+++ b/pkcs11/gkm/gkm-certificate.c
@@ -514,7 +514,7 @@ gkm_certificate_class_init (GkmCertificateClass *klass)
 }
 
 static gboolean
-gkm_certificate_real_load (GkmSerializable *base, GkmSecret *login, const guchar *data, gsize n_data)
+gkm_certificate_real_load (GkmSerializable *base, GkmSecret *login, gconstpointer data, gsize n_data)
 {
 	GkmCertificate *self = GKM_CERTIFICATE (base);
 	GNode *asn1 = NULL;
@@ -590,7 +590,7 @@ gkm_certificate_real_load (GkmSerializable *base, GkmSecret *login, const guchar
 }
 
 static gboolean
-gkm_certificate_real_save (GkmSerializable *base, GkmSecret *login, guchar **data, gsize *n_data)
+gkm_certificate_real_save (GkmSerializable *base, GkmSecret *login, gpointer *data, gsize *n_data)
 {
 	GkmCertificate *self = GKM_CERTIFICATE (base);
 
diff --git a/pkcs11/gkm/gkm-serializable.c b/pkcs11/gkm/gkm-serializable.c
index aded466..c0ff12d 100644
--- a/pkcs11/gkm/gkm-serializable.c
+++ b/pkcs11/gkm/gkm-serializable.c
@@ -63,7 +63,7 @@ gkm_serializable_get_type (void)
 }
 
 gboolean
-gkm_serializable_load (GkmSerializable *self, GkmSecret *login, const guchar *data, gsize n_data)
+gkm_serializable_load (GkmSerializable *self, GkmSecret *login, gconstpointer data, gsize n_data)
 {
 	g_return_val_if_fail (GKM_IS_SERIALIZABLE (self), FALSE);
 	g_return_val_if_fail (GKM_SERIALIZABLE_GET_INTERFACE (self)->load, FALSE);
@@ -71,7 +71,7 @@ gkm_serializable_load (GkmSerializable *self, GkmSecret *login, const guchar *da
 }
 
 gboolean
-gkm_serializable_save (GkmSerializable *self, GkmSecret *login, guchar **data, gsize *n_data)
+gkm_serializable_save (GkmSerializable *self, GkmSecret *login, gpointer *data, gsize *n_data)
 {
 	g_return_val_if_fail (GKM_IS_SERIALIZABLE (self), FALSE);
 	g_return_val_if_fail (GKM_SERIALIZABLE_GET_INTERFACE (self)->save, FALSE);
diff --git a/pkcs11/gkm/gkm-serializable.h b/pkcs11/gkm/gkm-serializable.h
index fbf3583..385793c 100644
--- a/pkcs11/gkm/gkm-serializable.h
+++ b/pkcs11/gkm/gkm-serializable.h
@@ -41,21 +41,21 @@ struct _GkmSerializableIface {
 
 	const gchar *extension;
 
-	gboolean (*load) (GkmSerializable *self, GkmSecret *login, const guchar *data, gsize n_data);
+	gboolean (*load) (GkmSerializable *self, GkmSecret *login, gconstpointer data, gsize n_data);
 
-	gboolean (*save) (GkmSerializable *self, GkmSecret *login, guchar **data, gsize *n_data);
+	gboolean (*save) (GkmSerializable *self, GkmSecret *login, gpointer *data, gsize *n_data);
 };
 
 GType                  gkm_serializable_get_type                          (void) G_GNUC_CONST;
 
 gboolean               gkm_serializable_load                              (GkmSerializable *self,
                                                                            GkmSecret *login,
-                                                                           const guchar *data,
+                                                                           gconstpointer data,
                                                                            gsize n_data);
 
 gboolean                gkm_serializable_save                             (GkmSerializable *self,
                                                                            GkmSecret *login,
-                                                                           guchar** data,
+                                                                           gpointer *data,
                                                                            gsize *n_data);
 
 G_END_DECLS
diff --git a/pkcs11/gnome2-store/gkm-gnome2-private-key.c b/pkcs11/gnome2-store/gkm-gnome2-private-key.c
index 31163cf..357e7ce 100644
--- a/pkcs11/gnome2-store/gkm-gnome2-private-key.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-private-key.c
@@ -204,7 +204,7 @@ gkm_gnome2_private_key_class_init (GkmGnome2PrivateKeyClass *klass)
 }
 
 static gboolean
-gkm_gnome2_private_key_real_load (GkmSerializable *base, GkmSecret *login, const guchar *data, gsize n_data)
+gkm_gnome2_private_key_real_load (GkmSerializable *base, GkmSecret *login, gconstpointer data, gsize n_data)
 {
 	GkmGnome2PrivateKey *self = GKM_GNOME2_PRIVATE_KEY (base);
 	GkmDataResult res;
@@ -290,7 +290,7 @@ gkm_gnome2_private_key_real_load (GkmSerializable *base, GkmSecret *login, const
 }
 
 static gboolean
-gkm_gnome2_private_key_real_save (GkmSerializable *base, GkmSecret *login, guchar **data, gsize *n_data)
+gkm_gnome2_private_key_real_save (GkmSerializable *base, GkmSecret *login, gpointer *data, gsize *n_data)
 {
 	GkmGnome2PrivateKey *self = GKM_GNOME2_PRIVATE_KEY (base);
 	const gchar *password;
diff --git a/pkcs11/gnome2-store/gkm-gnome2-public-key.c b/pkcs11/gnome2-store/gkm-gnome2-public-key.c
index c5fd5cf..e5c16be 100644
--- a/pkcs11/gnome2-store/gkm-gnome2-public-key.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-public-key.c
@@ -120,7 +120,7 @@ gkm_gnome2_public_key_class_init (GkmGnome2PublicKeyClass *klass)
 
 
 static gboolean
-gkm_gnome2_public_key_real_load (GkmSerializable *base, GkmSecret *login, const guchar *data, gsize n_data)
+gkm_gnome2_public_key_real_load (GkmSerializable *base, GkmSecret *login, gconstpointer data, gsize n_data)
 {
 	GkmGnome2PublicKey *self = GKM_GNOME2_PUBLIC_KEY (base);
 	GkmDataResult res;
@@ -156,7 +156,7 @@ gkm_gnome2_public_key_real_load (GkmSerializable *base, GkmSecret *login, const
 }
 
 static gboolean
-gkm_gnome2_public_key_real_save (GkmSerializable *base, GkmSecret *login, guchar **data, gsize *n_data)
+gkm_gnome2_public_key_real_save (GkmSerializable *base, GkmSecret *login, gpointer *data, gsize *n_data)
 {
 	GkmGnome2PublicKey *self = GKM_GNOME2_PUBLIC_KEY (base);
 	GkmSexp *wrapper;
diff --git a/pkcs11/gnome2-store/gkm-gnome2-storage.c b/pkcs11/gnome2-store/gkm-gnome2-storage.c
index 1244181..6c8ef7f 100644
--- a/pkcs11/gnome2-store/gkm-gnome2-storage.c
+++ b/pkcs11/gnome2-store/gkm-gnome2-storage.c
@@ -596,7 +596,7 @@ relock_object (GkmGnome2Storage *self, GkmTransaction *transaction, const gchar
 {
 	GError *error = NULL;
 	GkmObject *object;
-	guchar *data;
+	gpointer data;
 	gsize n_data;
 	GType type;
 
@@ -1045,7 +1045,7 @@ gkm_gnome2_storage_create (GkmGnome2Storage *self, GkmTransaction *transaction,
 	gboolean is_private;
 	GkmDataResult res;
 	gchar *identifier;
-	guchar *data;
+	gpointer data;
 	gsize n_data;
 	gchar *path;