[gnome-keyring] Solaris CC doesn't allow return void

[Stefan Walter <stefw src gnome org>]

commit 461570351b6d5e7d48afeeeec4b4b9696772a7af
Author: Jeff Cai <jeff cai sun com>
Date:   Sun Feb 7 18:47:02 2010 +0000

    Solaris CC doesn't allow return void
    
    Fixes bug #606710

 daemon/dbus/gkd-secret-objects.c            |    2 +-
 pkcs11/gck/gck-session.c                    |   15 +++++++---
 pkcs11/secret-store/gck-secret-collection.c |   36 ++++++++++++++++++---------
 3 files changed, 35 insertions(+), 18 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-objects.c b/daemon/dbus/gkd-secret-objects.c
index 4c5b5a8..c19bd50 100644
--- a/daemon/dbus/gkd-secret-objects.c
+++ b/daemon/dbus/gkd-secret-objects.c
@@ -1329,5 +1329,5 @@ gkd_secret_objects_set_alias (GkdSecretObjects *self, const gchar *alias,
 	g_return_if_fail (GKD_SECRET_IS_OBJECTS (self));
 	g_return_if_fail (alias);
 	g_return_if_fail (identifier);
-	return g_hash_table_replace (self->aliases, g_strdup (alias), g_strdup (identifier));
+	g_hash_table_replace (self->aliases, g_strdup (alias), g_strdup (identifier));
 }
diff --git a/pkcs11/gck/gck-session.c b/pkcs11/gck/gck-session.c
index ead7b1c..7b19f67 100644
--- a/pkcs11/gck/gck-session.c
+++ b/pkcs11/gck/gck-session.c
@@ -852,17 +852,22 @@ gck_session_complete_object_creation (GckSession *self, GckTransaction *transact
 	/* See if we can create due to read-only */
 	if (gck_object_is_token (object)) {
 		if (!gck_object_is_transient (object) &&
-		    gck_module_get_write_protected (self->pv->module))
-			return gck_transaction_fail (transaction, CKR_TOKEN_WRITE_PROTECTED);
-		else if (self->pv->read_only)
-			return gck_transaction_fail (transaction, CKR_SESSION_READ_ONLY);
+		    gck_module_get_write_protected (self->pv->module)) {
+			gck_transaction_fail (transaction, CKR_TOKEN_WRITE_PROTECTED);
+			return;
+		}
+		else if (self->pv->read_only) {
+			gck_transaction_fail (transaction, CKR_SESSION_READ_ONLY);
+			return;
+		}
 	}
 
 	/* Can only create public objects unless logged in */
 	if (gck_session_get_logged_in (self) != CKU_USER &&
 	    gck_object_get_attribute_boolean (object, self, CKA_PRIVATE, &is_private) &&
 	    is_private == TRUE) {
-		return gck_transaction_fail (transaction, CKR_USER_NOT_LOGGED_IN);
+		gck_transaction_fail (transaction, CKR_USER_NOT_LOGGED_IN);
+		return;
 	}
 
 	/* Next go through and set all attributes that weren't used initially */
diff --git a/pkcs11/secret-store/gck-secret-collection.c b/pkcs11/secret-store/gck-secret-collection.c
index 45f1bd2..1d569da 100644
--- a/pkcs11/secret-store/gck-secret-collection.c
+++ b/pkcs11/secret-store/gck-secret-collection.c
@@ -327,8 +327,10 @@ change_master_password (GckSecretCollection *self, GckTransaction *transaction,
 	g_assert (GCK_IS_TRANSACTION (transaction));
 	g_assert (GCK_IS_CREDENTIAL (cred));
 
-	if (!self->sdata)
-		return gck_transaction_fail (transaction, CKR_USER_NOT_LOGGED_IN);
+	if (!self->sdata) {
+		gck_transaction_fail (transaction, CKR_USER_NOT_LOGGED_IN);
+		return;
+	}
 
 	previous = gck_secret_data_get_master (self->sdata);
 	if (previous != NULL)
@@ -373,20 +375,28 @@ gck_secret_collection_set_attribute (GckObject *object, GckSession *session,
 	case CKA_G_CREDENTIAL:
 		gck_credential_for_each (session, GCK_OBJECT (self),
 		                         find_unlocked_credential, &handle);
-		if (handle == 0)
-			return gck_transaction_fail (transaction, CKR_USER_NOT_LOGGED_IN);
+		if (handle == 0) {
+			gck_transaction_fail (transaction, CKR_USER_NOT_LOGGED_IN);
+			return;
+		}
 		rv = gck_attribute_get_ulong (attr, &handle);
-		if (rv != CKR_OK)
-			return gck_transaction_fail (transaction, rv);
+		if (rv != CKR_OK) {
+			gck_transaction_fail (transaction, rv);
+			return;
+		}
 		cred = lookup_unassociated_credential (session, handle);
-		if (cred == NULL)
-			return gck_transaction_fail (transaction, CKR_ATTRIBUTE_VALUE_INVALID);
+		if (cred == NULL) {
+			gck_transaction_fail (transaction, CKR_ATTRIBUTE_VALUE_INVALID);
+			return;
+		}
 		change_master_password (self, transaction, cred);
 		return;
 	case CKA_G_CREDENTIAL_TEMPLATE:
 		rv = gck_attribute_get_template (attr, &template);
-		if (rv != CKR_OK)
-			return gck_transaction_fail (transaction, rv);
+		if (rv != CKR_OK) {
+			gck_transaction_fail (transaction, rv);
+			return;
+		}
 		gck_template_free (self->template);
 		self->template = template;
 		return;
@@ -825,8 +835,10 @@ gck_secret_collection_save (GckSecretCollection *self, GckTransaction *transacti
 	g_return_if_fail (!gck_transaction_get_failed (transaction));
 
 	/* HACK: We can't save unless the secret data was loaded */
-	if (!self->sdata)
-		return gck_transaction_fail (transaction, CKR_USER_NOT_LOGGED_IN);
+	if (!self->sdata) {
+		gck_transaction_fail (transaction, CKR_USER_NOT_LOGGED_IN);
+		return;
+	}
 
 	/* Don't save ourselves if no filename */
 	if (!self->filename)