[PATCH v1 02/20] session: Do not fail when creating default policy configuration

[Daniel Wagner]

From: Daniel Wagner <daniel.wag...@bmw-carit.de>

Do not handle the small alloc failures because glib will abort
when memory is tight anyway.
---
 include/session.h              |  2 +-
 plugins/session_policy_local.c | 12 +-----------
 src/session.c                  | 16 +++-------------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/include/session.h b/include/session.h
index 47d36c5..cf32e48 100644
--- a/include/session.h
+++ b/include/session.h
@@ -78,7 +78,7 @@ void connman_session_policy_unregister(struct 
connman_session_policy *config);
 int connman_session_config_update(struct connman_session *session);
 void connman_session_destroy(struct connman_session *session);
 
-int connman_session_set_default_config(struct connman_session_config *config);
+void connman_session_set_default_config(struct connman_session_config *config);
 struct connman_session_config *connman_session_create_default_config(void);
 
 enum connman_session_roaming_policy connman_session_parse_roaming_policy(const 
char *policy);
diff --git a/plugins/session_policy_local.c b/plugins/session_policy_local.c
index d3e51a2..90396cf 100644
--- a/plugins/session_policy_local.c
+++ b/plugins/session_policy_local.c
@@ -120,11 +120,6 @@ static struct policy_data *create_policy(const char *ident)
                return NULL;
 
        policy->config = connman_session_create_default_config();
-       if (policy->config == NULL) {
-               g_free(policy);
-               return NULL;
-       }
-
        policy->refcount = 1;
        policy->ident = g_strdup(ident);
 
@@ -384,12 +379,7 @@ static void remove_policy(struct policy_data *policy)
        if (update == FALSE)
                return;
 
-       err = connman_session_set_default_config(policy->config);
-       if (err < 0) {
-               connman_session_destroy(policy->session);
-               return;
-       }
-
+       connman_session_set_default_config(policy->config);
        update_session(policy->session);
 }
 
diff --git a/src/session.c b/src/session.c
index 6916458..b7b0a1f 100644
--- a/src/session.c
+++ b/src/session.c
@@ -407,7 +407,7 @@ void connman_session_policy_unregister(struct 
connman_session_policy *policy)
        remove_policy(policy);
 }
 
-int connman_session_set_default_config(struct connman_session_config *config)
+void connman_session_set_default_config(struct connman_session_config *config)
 {
        config->priority = FALSE;
        config->roaming_policy = CONNMAN_SESSION_ROAMING_POLICY_DEFAULT;
@@ -417,24 +417,14 @@ int connman_session_set_default_config(struct 
connman_session_config *config)
        g_slist_free(config->allowed_bearers);
        config->allowed_bearers = g_slist_prepend(NULL,
                                GINT_TO_POINTER(CONNMAN_SERVICE_TYPE_UNKNOWN));
-       if (config->allowed_bearers == NULL)
-               return -ENOMEM;
-
-       return 0;
 }
 
 struct connman_session_config *connman_session_create_default_config(void)
 {
        struct connman_session_config *config;
 
-       config = g_try_new0(struct connman_session_config, 1);
-       if (config == NULL)
-               return NULL;
-
-       if (connman_session_set_default_config(config) < 0) {
-               g_free(config);
-               return NULL;
-       }
+       config = g_new0(struct connman_session_config, 1);
+       connman_session_set_default_config(config);
 
        return config;
 }
-- 
1.8.1.3.566.gaa39828

_______________________________________________
connman mailing list
connman@connman.net
http://lists.connman.net/listinfo/connman