soc.2008.masterpassword: 8a1a035b: Remove unnecessary return statements.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 8a1a035b69a7baaffeb5cf8c890fc9f200e28cd3
Parent:   6a644e16b8830317ffdc6d0da742f20070b10d2f
Author:   qulogic at pidgin.im
Date:     10/31/11 02:53:06
Branch:   im.pidgin.soc.2008.masterpassword
URL: http://d.pidgin.im/viewmtn/revision/info/8a1a035b69a7baaffeb5cf8c890fc9f200e28cd3

Changelog: 

Remove unnecessary return statements.

Changes against parent 6a644e16b8830317ffdc6d0da742f20070b10d2f

  patched  libpurple/keyring.c
  patched  libpurple/plugins/keyrings/gnomekeyring.c
  patched  libpurple/plugins/keyrings/internalkeyring.c
  patched  libpurple/plugins/keyrings/kwallet.cpp

-------------- next part --------------
============================================================
--- libpurple/keyring.c	aebfc2815e2c56aea4c388abf4f69372f5585532
+++ libpurple/keyring.c	5b181239f810c7582e85f9ef3d5c33369b8df866
@@ -168,8 +168,6 @@ purple_keyring_set_name(PurpleKeyring * 
 
 	g_free(keyring->name);
 	keyring->name = g_strdup(name);
-
-	return;
 }
 
 void 
@@ -179,8 +177,6 @@ purple_keyring_set_id(PurpleKeyring * ke
 
 	g_free(keyring->id);
 	keyring->id = g_strdup(id);
-
-	return;
 }
 
 void
@@ -189,8 +185,6 @@ purple_keyring_set_read_password(PurpleK
 	g_return_if_fail(keyring != NULL);
 
 	keyring->read_password = read;
-
-	return;
 }
 
 void
@@ -199,8 +193,6 @@ purple_keyring_set_save_password(PurpleK
 	g_return_if_fail(keyring != NULL);
 
 	keyring->save_password = save;
-
-	return;
 }
 
 void
@@ -209,8 +201,6 @@ purple_keyring_set_close_keyring(PurpleK
 	g_return_if_fail(keyring != NULL);
 
 	keyring->close_keyring = close;
-
-	return;
 }
 
 void
@@ -219,8 +209,6 @@ purple_keyring_set_change_master(PurpleK
 	g_return_if_fail(keyring != NULL);
 
 	keyring->change_master = change;
-
-	return;
 }
 
 void
@@ -229,8 +217,6 @@ purple_keyring_set_import_password(Purpl
 	g_return_if_fail(keyring != NULL);
 
 	keyring->import_password = import;
-
-	return;
 }
 
 void
@@ -239,8 +225,6 @@ purple_keyring_set_export_password(Purpl
 	g_return_if_fail(keyring != NULL);
 
 	keyring->export_password = export;
-
-	return;
 }
 
 /*@}*/
@@ -299,8 +283,6 @@ purple_keyring_init()
 
 	purple_debug_info("keyring", "purple_keyring_init() done, selected keyring is : %s.\n",
 		purple_keyring_to_use);
-
-	return;
 }
 
 void
@@ -356,8 +338,6 @@ purple_keyring_drop_passwords(const Purp
 	     cur != NULL;
 	     cur = cur->next)
 		save(cur->data, NULL, NULL, NULL);
-
-	return;
 }
 
 
@@ -464,8 +444,6 @@ purple_keyring_set_inuse_check_error_cb(
 	 * are not exposed. So these was done for consistency.
 	 */
 	purple_account_set_password(NULL, NULL, NULL, NULL);
-
-	return;
 }
 
 
@@ -519,8 +497,6 @@ purple_keyring_set_inuse_got_pw_cb(Purpl
 			g_error_free(error);
 		}
 	}
-
-	return;
 }
 
 
@@ -605,8 +581,6 @@ purple_keyring_set_inuse(const PurpleKey
 
 		if (cb != NULL)
 			cb(newkeyring, TRUE, NULL, data);
-
-		return;
 	}
 }
 
@@ -628,8 +602,6 @@ purple_keyring_pref_cb(const char *pref,
 	g_return_if_fail(new != NULL);
 
 	purple_keyring_set_inuse(new, FALSE, NULL, data);
-
-	return;
 }
 
 GList *
@@ -909,8 +881,6 @@ purple_keyring_get_password(PurpleAccoun
 			}
 		}
 	}
-
-	return;
 }
 
 void 
@@ -950,7 +920,6 @@ purple_keyring_set_password(PurpleAccoun
 			save(account, password, purple_keyring_set_password_async_cb, data);
 		}
 	}
-	return;
 }
 
 static void 
@@ -988,8 +957,6 @@ purple_keyring_close(PurpleKeyring * key
 		*error = g_error_new(ERR_PIDGINKEYRING, ERR_INVALID,
 			"No keyring passed to the function.");
 
-		return;
-
 	} else {
 		close = purple_keyring_get_close_keyring(keyring);
 
@@ -1002,8 +969,6 @@ purple_keyring_close(PurpleKeyring * key
 
 		}
 	}
-
-	return;
 }
 
 
@@ -1041,7 +1006,6 @@ purple_keyring_change_master(PurpleKeyri
 
 		}
 	}
-	return;
 }
 
 /*@}*/
============================================================
--- libpurple/plugins/keyrings/gnomekeyring.c	b86f5b119a339f921a50c1d2cc59e1db2ac030a6
+++ libpurple/plugins/keyrings/gnomekeyring.c	52c6fc2154ad8b152eaca5be4d5fc70c5faf940a
@@ -173,7 +173,6 @@ static void gkp_read_continue(GnomeKeyri
 			cb(account, copy, NULL, storage->user_data);
 			g_free(copy);
 		}
-		return;
 	}
 }
 
@@ -226,7 +225,6 @@ gkp_save(PurpleAccount * account,
 					      NULL);
 
 	}
-	return;
 }
 
 static void
@@ -297,16 +295,12 @@ gkp_save_continue(GnomeKeyringResult res
 
 		if(cb != NULL)
 			cb(account, NULL, storage->user_data);
-
-		return;
-	
 	}
 }
 
 static void
 gkp_close(GError ** error)
 {
-	return;
 }
 
 static gboolean
@@ -413,7 +407,6 @@ gkp_destroy(PurplePlugin *plugin)
 gkp_destroy(PurplePlugin *plugin)
 {
 	gkp_uninit();
-	return;
 }
 
 PurplePluginInfo plugininfo =
============================================================
--- libpurple/plugins/keyrings/internalkeyring.c	af26ab59f6131cc2816c17420d64cd95efc2118f
+++ libpurple/plugins/keyrings/internalkeyring.c	8860ca762d714193898d292bde6da4b9b844ffa5
@@ -115,7 +115,6 @@ internal_keyring_read(PurpleAccount * ac
 			cb(account, NULL, error, data);
 		g_error_free(error);
 	}
-	return;
 }
 
 static void
@@ -146,7 +145,6 @@ internal_keyring_save(PurpleAccount * ac
 
 	if (cb != NULL)
 		cb(account, NULL, data);
-	return;
 }
 
 
@@ -280,7 +278,6 @@ internal_keyring_destroy(PurplePlugin *p
 internal_keyring_destroy(PurplePlugin *plugin)
 {
 	internal_keyring_uninit();
-	return;
 }
 
 PurplePluginInfo plugininfo =
============================================================
--- libpurple/plugins/keyrings/kwallet.cpp	7423a9acfaff35a071e30e91d17d5f403dd0a2eb
+++ libpurple/plugins/keyrings/kwallet.cpp	8ff631b3dfd752191a6f840c9b9046e3b8a9861a
@@ -397,7 +397,6 @@ gkp_destroy(PurplePlugin *plugin)
 gkp_destroy(PurplePlugin *plugin)
 {
 	kwallet_close();
-	return;
 }
 
 void