[gnome-online-accounts] oauth: Style fixes
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] oauth: Style fixes
- Date: Fri, 4 Aug 2017 15:05:08 +0000 (UTC)
commit 73e2e0fa5831ce837918cff3a1225809ea442af1
Author: Debarshi Ray <debarshir gnome org>
Date: Fri Aug 4 15:54:17 2017 +0200
oauth: Style fixes
Don't use a separate line to initialize variables.
src/goabackend/goaoauthprovider.c | 140 ++++++++++++-------------------------
1 files changed, 44 insertions(+), 96 deletions(-)
---
diff --git a/src/goabackend/goaoauthprovider.c b/src/goabackend/goaoauthprovider.c
index 7bde331..b038efb 100644
--- a/src/goabackend/goaoauthprovider.c
+++ b/src/goabackend/goaoauthprovider.c
@@ -502,22 +502,15 @@ get_tokens_sync (GoaOAuthProvider *provider,
{
RestProxy *proxy;
RestProxyCall *call;
- gchar *ret;
+ gchar *ret = NULL;
guint status_code;
GHashTable *f;
const gchar *expires_in_str;
- gchar *ret_access_token;
- gchar *ret_access_token_secret;
- gint ret_access_token_expires_in;
- gchar *ret_session_handle;
- gint ret_session_handle_expires_in;
-
- ret = NULL;
- ret_access_token = NULL;
- ret_access_token_secret = NULL;
- ret_access_token_expires_in = 0;
- ret_session_handle = NULL;
- ret_session_handle_expires_in = 0;
+ gchar *ret_access_token = NULL;
+ gchar *ret_access_token_secret = NULL;
+ gint ret_access_token_expires_in = 0;
+ gchar *ret_session_handle = NULL;
+ gint ret_session_handle_expires_in = 0;
proxy = oauth_proxy_new (goa_oauth_provider_get_consumer_key (provider),
goa_oauth_provider_get_consumer_secret (provider),
@@ -705,18 +698,18 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
gchar **out_password,
GError **error)
{
- gboolean ret;
- gchar *url;
+ gboolean ret = FALSE;
+ gchar *url = NULL;
IdentifyData data;
- gchar *escaped_request_token;
- RestProxy *proxy;
- RestProxyCall *call;
+ gchar *escaped_request_token = NULL;
+ RestProxy *proxy = NULL;
+ RestProxyCall *call = NULL;
GHashTable *f;
GtkWidget *embed;
GtkWidget *grid;
GtkWidget *spinner;
GtkWidget *web_view;
- gchar **request_params;
+ gchar **request_params = NULL;
guint n;
g_return_val_if_fail (GOA_IS_OAUTH_PROVIDER (provider), FALSE);
@@ -726,13 +719,6 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
g_return_val_if_fail (GTK_IS_BOX (vbox), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- ret = FALSE;
- escaped_request_token = NULL;
- proxy = NULL;
- call = NULL;
- url = NULL;
- request_params = NULL;
-
/* TODO: check with NM whether we're online, if not - return error */
memset (&data, '\0', sizeof (IdentifyData));
@@ -995,15 +981,15 @@ goa_oauth_provider_add_account (GoaProvider *_provider,
GError **error)
{
GoaOAuthProvider *provider = GOA_OAUTH_PROVIDER (_provider);
- GoaObject *ret;
- gchar *access_token;
- gchar *access_token_secret;
+ GoaObject *ret = NULL;
+ gchar *access_token = NULL;
+ gchar *access_token_secret = NULL;
gint access_token_expires_in;
- gchar *session_handle;
+ gchar *session_handle = NULL;
gint session_handle_expires_in;
- gchar *identity;
- gchar *presentation_identity;
- gchar *password;
+ gchar *identity = NULL;
+ gchar *presentation_identity = NULL;
+ gchar *password = NULL;
AddData data;
GVariantBuilder credentials;
GVariantBuilder details;
@@ -1014,14 +1000,6 @@ goa_oauth_provider_add_account (GoaProvider *_provider,
g_return_val_if_fail (GTK_IS_BOX (vbox), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- ret = NULL;
- access_token = NULL;
- access_token_secret = NULL;
- session_handle = NULL;
- identity = NULL;
- presentation_identity = NULL;
- password = NULL;
-
memset (&data, '\0', sizeof (AddData));
data.loop = g_main_loop_new (NULL, FALSE);
@@ -1121,17 +1099,17 @@ goa_oauth_provider_refresh_account (GoaProvider *_provider,
GoaOAuthProvider *provider = GOA_OAUTH_PROVIDER (_provider);
GoaAccount *account;
GtkWidget *dialog;
- gchar *access_token;
- gchar *access_token_secret;
- gchar *password;
+ gchar *access_token = NULL;
+ gchar *access_token_secret = NULL;
+ gchar *password = NULL;
gint access_token_expires_in;
- gchar *session_handle;
+ gchar *session_handle = NULL;
gint session_handle_expires_in;
- gchar *identity;
+ gchar *identity = NULL;
const gchar *existing_identity;
const gchar *existing_presentation_identity;
GVariantBuilder builder;
- gboolean ret;
+ gboolean ret = FALSE;
g_return_val_if_fail (GOA_IS_OAUTH_PROVIDER (provider), FALSE);
g_return_val_if_fail (GOA_IS_CLIENT (client), FALSE);
@@ -1139,14 +1117,6 @@ goa_oauth_provider_refresh_account (GoaProvider *_provider,
g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- access_token = NULL;
- access_token_secret = NULL;
- password = NULL;
- session_handle = NULL;
- identity = NULL;
-
- ret = FALSE;
-
dialog = gtk_dialog_new_with_buttons (NULL,
parent,
GTK_DIALOG_MODAL
@@ -1285,22 +1255,22 @@ goa_oauth_provider_get_access_token_sync (GoaOAuthProvider *provider,
GCancellable *cancellable,
GError **error)
{
- GVariant *credentials;
+ GVariant *credentials = NULL;
GVariantIter iter;
const gchar *key;
GVariant *value;
- gchar *access_token;
- gchar *access_token_secret;
- gchar *session_handle;
- gchar *access_token_for_refresh;
- gchar *access_token_secret_for_refresh;
- gchar *session_handle_for_refresh;
- gchar *password;
- gint access_token_expires_in;
- gint session_handle_expires_in;
- gboolean success;
+ gchar *access_token = NULL;
+ gchar *access_token_secret = NULL;
+ gchar *session_handle = NULL;
+ gchar *access_token_for_refresh = NULL;
+ gchar *access_token_secret_for_refresh = NULL;
+ gchar *session_handle_for_refresh = NULL;
+ gchar *password = NULL;
+ gint access_token_expires_in = 0;
+ gint session_handle_expires_in = 0;
+ gboolean success = FALSE;
GVariantBuilder builder;
- gchar *ret;
+ gchar *ret = NULL;
GMutex *lock;
g_return_val_if_fail (GOA_IS_OAUTH_PROVIDER (provider), NULL);
@@ -1308,19 +1278,6 @@ goa_oauth_provider_get_access_token_sync (GoaOAuthProvider *provider,
g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- ret = NULL;
- credentials = NULL;
- access_token = NULL;
- access_token_secret = NULL;
- access_token_expires_in = 0;
- session_handle = NULL;
- session_handle_expires_in = 0;
- access_token_for_refresh = NULL;
- access_token_secret_for_refresh = NULL;
- session_handle_for_refresh = NULL;
- password = NULL;
- success = FALSE;
-
/* provider_lock is too coarse, use a per-object lock instead */
G_LOCK (provider_lock);
lock = g_object_get_data (G_OBJECT (object), "-goa-oauth-provider-get-access-token-lock");
@@ -1539,18 +1496,12 @@ goa_oauth_provider_ensure_credentials_sync (GoaProvider *_provider,
GError **error)
{
GoaOAuthProvider *provider = GOA_OAUTH_PROVIDER (_provider);
- gboolean ret;
- gchar *access_token;
- gchar *access_token_secret;
+ gboolean ret = FALSE;
+ gchar *access_token = NULL;
+ gchar *access_token_secret = NULL;
gint access_token_expires_in;
- gchar *identity;
- gboolean force_refresh;
-
- ret = FALSE;
- access_token = NULL;
- access_token_secret = NULL;
- identity = NULL;
- force_refresh = FALSE;
+ gchar *identity = NULL;
+ gboolean force_refresh = FALSE;
again:
access_token = goa_oauth_provider_get_access_token_sync (provider,
@@ -1640,15 +1591,12 @@ on_handle_get_access_token (GoaOAuthBased *interface,
const gchar *id;
const gchar *method_name;
const gchar *provider_type;
- gchar *access_token;
- gchar *access_token_secret;
+ gchar *access_token = NULL;
+ gchar *access_token_secret = NULL;
gint access_token_expires_in;
/* TODO: maybe log what app is requesting access */
- access_token = NULL;
- access_token_secret = NULL;
-
object = GOA_OBJECT (g_dbus_interface_get_object (G_DBUS_INTERFACE (interface)));
account = goa_object_peek_account (object);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]