Some more whitespace cleanups

diff --git a/src/config.c b/src/config.c
index d36b5e6..eb083e0 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -108,20 +108,22 @@ static int load_service(GKeyFile *keyfile, struct connman_config *config)
                service->ca_cert_file = str;
        }
 
-       str = g_key_file_get_string(keyfile, "service", "ClientCertFile", NULL);
+       str = g_key_file_get_string(keyfile, "service",
+                                               "ClientCertFile", NULL);
        if (str != NULL) {
                g_free(service->client_cert_file);
                service->client_cert_file = str;
        }
 
-       str = g_key_file_get_string(keyfile, "service", "PrivateKeyFile", NULL);
+       str = g_key_file_get_string(keyfile, "service",
+                                               "PrivateKeyFile", NULL);
        if (str != NULL) {
                g_free(service->private_key_file);
                service->private_key_file = str;
        }
 
-       str = g_key_file_get_string(keyfile, "service", "PrivateKeyPassphrase",
-                                   NULL);
+       str = g_key_file_get_string(keyfile, "service",
+                                               "PrivateKeyPassphrase", NULL);
        if (str != NULL) {
                g_free(service->private_key_passphrase);
                service->private_key_passphrase = str;
@@ -144,7 +146,6 @@ static int load_service(GKeyFile *keyfile, struct connman_config *config)
        if (error == NULL)
                service->passphrase_from_fsid = pass_from_fsid;
 
-
        return 0;
 }
 
@@ -318,19 +319,19 @@ static void config_service_setup(struct connman_service *service,
 
        if (config->identity)
                __connman_service_set_string(service, "Identity",
-                                            config->identity);
+                                                       config->identity);
 
        if (config->ca_cert_file)
                __connman_service_set_string(service, "CACertFile",
-                                            config->ca_cert_file);
+                                                       config->ca_cert_file);
 
        if (config->client_cert_file)
                __connman_service_set_string(service, "ClientCertFile",
-                                            config->client_cert_file);
+                                               config->client_cert_file);
 
        if (config->private_key_file)
                __connman_service_set_string(service, "PrivateKeyFile",
-                                            config->private_key_file);
+                                               config->private_key_file);
 
        if (config->passphrase_from_fsid == TRUE &&
                                        config->private_key_file) {
@@ -346,7 +347,7 @@ static void config_service_setup(struct connman_service *service,
 
        if (config->private_key_passphrase) {
                __connman_service_set_string(service, "PrivateKeyPassphrase",
-                                            config->private_key_passphrase);
+                                               config->private_key_passphrase);
                /*
                 * TODO: Support for PEAP with both identity and key passwd.
                 * In that case, we should check if both of them are found
@@ -355,7 +356,7 @@ static void config_service_setup(struct connman_service *service,
                 * additional passphrase.
                 */
                __connman_service_set_string(service, "Passphrase",
-                                            config->private_key_passphrase);
+                                               config->private_key_passphrase);
        }
 
        if (config->phase2)
@@ -404,16 +405,17 @@ int __connman_config_provision_service(struct connman_service *service)
        }
 
        g_hash_table_iter_init(&iter, config_hash);
+
        while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
                config = value;
 
-               /* For now we only support wifi services entries */
+               /* For now only WiFi service entries are supported */
                if (config->service &&
                                g_strcmp0(config->service->type, "wifi") == 0 &&
                                ssid_len == config->service->ssid_len)
                        if (config->service->ssid &&
                                        memcmp(config->service->ssid, ssid,
-                                              ssid_len) == 0)
+                                                               ssid_len) == 0)
                                break;
        }
 

diff --git a/src/connman.h b/src/connman.h
index e7869f9..f8f134f 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -378,7 +378,7 @@ unsigned int __connman_service_get_order(struct connman_service *service);
 struct connman_network *__connman_service_get_network(struct connman_service *service);
 
 void __connman_service_set_string(struct connman_service *service,
-                                 const char *key, const char *value);
+                                       const char *key, const char *value);
 int __connman_service_indicate_state(struct connman_service *service,
                                        enum connman_service_state state);
 int __connman_service_indicate_error(struct connman_service *service,

diff --git a/src/service.c b/src/service.c
index 8cad042..9d33360 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1630,7 +1630,6 @@ static void prepare_8021x(struct connman_service *service)
                                                        service->phase2);
 }
 
-
 int __connman_service_connect(struct connman_service *service)
 {
        int err;