diff options
| author | Damien Laniel <dlaniel@entrouvert.com> | 2008-05-21 09:45:20 +0000 |
|---|---|---|
| committer | Damien Laniel <dlaniel@entrouvert.com> | 2008-05-21 09:45:20 +0000 |
| commit | a779166e31bdb8603153218e60a4f2b37c239ce4 (patch) | |
| tree | 2867aafddcf04e6d7ee569459d58a6a347274998 | |
| parent | b3d861afa2b019a964901be125e1a9b2bf5bf376 (diff) | |
removed warning when calling lasso_node_destroy with NULL argument
| -rw-r--r-- | lasso/id-ff/login.c | 10 | ||||
| -rw-r--r-- | lasso/xml/xml.c | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lasso/id-ff/login.c b/lasso/id-ff/login.c index 9705a18c..585b61b6 100644 --- a/lasso/id-ff/login.c +++ b/lasso/id-ff/login.c @@ -2095,17 +2095,15 @@ dispose(GObject *object) g_free(login->private_data->soap_request_msg); login->private_data->soap_request_msg = NULL; - if (login->private_data->saml2_assertion) - lasso_node_destroy(LASSO_NODE(login->private_data->saml2_assertion)); + + lasso_node_destroy(LASSO_NODE(login->private_data->saml2_assertion)); login->private_data->saml2_assertion = NULL; #ifdef LASSO_WSF_ENABLED - if (login->private_data->resourceId) - lasso_node_destroy(LASSO_NODE(login->private_data->resourceId)); + lasso_node_destroy(LASSO_NODE(login->private_data->resourceId)); login->private_data->resourceId = NULL; - if (login->private_data->encryptedResourceId) - lasso_node_destroy(LASSO_NODE(login->private_data->encryptedResourceId)); + lasso_node_destroy(LASSO_NODE(login->private_data->encryptedResourceId)); login->private_data->encryptedResourceId = NULL; #endif G_OBJECT_CLASS(parent_class)->dispose(object); diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c index f93bab3d..fca322c6 100644 --- a/lasso/xml/xml.c +++ b/lasso/xml/xml.c @@ -259,7 +259,6 @@ void lasso_node_destroy(LassoNode *node) { if (node == NULL) { - message(G_LOG_LEVEL_CRITICAL, "lasso_node_destroy of NULL!!!"); return; } if (LASSO_IS_NODE(node)) { |