axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r645779 - in /webservices/axis2/trunk/c/neethi/src/secpolicy/model: algorithmsuite.c asymmetric_binding.c binding_commons.c
Date Tue, 08 Apr 2008 07:09:23 GMT
Author: pini
Date: Tue Apr  8 00:09:20 2008
New Revision: 645779

URL: http://svn.apache.org/viewvc?rev=645779&view=rev
Log:
Fixing jira issues 1100, 1101, 1103

Modified:
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/algorithmsuite.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/asymmetric_binding.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/binding_commons.c

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/algorithmsuite.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/algorithmsuite.c?rev=645779&r1=645778&r2=645779&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/algorithmsuite.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/algorithmsuite.c Tue Apr  8 00:09:20
2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -46,7 +45,7 @@
 
 AXIS2_EXTERN rp_algorithmsuite_t *AXIS2_CALL
 rp_algorithmsuite_create(
-    const axutil_env_t * env)
+    const axutil_env_t *env)
 {
     rp_algorithmsuite_t *algorithmsuite = NULL;
 
@@ -59,6 +58,7 @@
     if (algorithmsuite == NULL)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     algorithmsuite->algosuite_string = NULL;
@@ -87,11 +87,9 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 rp_algorithmsuite_free(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (algorithmsuite)
     {
         if (--(algorithmsuite->ref) > 0)
@@ -109,11 +107,9 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_algosuite_string(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (!algorithmsuite)
         return NULL;
     else
@@ -123,11 +119,10 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_algosuite(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
-    axis2_char_t * algosuite_string)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    axis2_char_t *algosuite_string)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, algosuite_string, AXIS2_FAILURE);
 
     algorithmsuite->algosuite_string = algosuite_string;
@@ -371,22 +366,18 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_symmetric_signature(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->symmetric_signature;
-
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_symmetric_signature(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
-    axis2_char_t * symmetric_signature)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    axis2_char_t *symmetric_signature)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, symmetric_signature, AXIS2_FAILURE);
 
     algorithmsuite->symmetric_signature = symmetric_signature;
@@ -395,22 +386,18 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_asymmetric_signature(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->asymmetric_signature;
-
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_asymmetric_signature(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
-    axis2_char_t * asymmetric_signature)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    axis2_char_t *asymmetric_signature)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, asymmetric_signature, AXIS2_FAILURE);
 
     algorithmsuite->asymmetric_signature = asymmetric_signature;
@@ -419,21 +406,18 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_computed_key(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->computed_key;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_computed_key(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
-    axis2_char_t * computed_key)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    axis2_char_t *computed_key)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, computed_key, AXIS2_FAILURE);
 
     algorithmsuite->computed_key = computed_key;
@@ -442,263 +426,211 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_digest(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->digest;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_encryption(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->encryption;
 }
 
 AXIS2_EXTERN int AXIS2_CALL
 rp_algorithmsuite_get_max_symmetric_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->max_symmetric_keylength;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_max_symmetric_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
     int max_symmetric_keylength)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     algorithmsuite->max_symmetric_keylength = max_symmetric_keylength;
-
     return AXIS2_SUCCESS;
-
 }
 
 AXIS2_EXTERN int AXIS2_CALL
 rp_algorithmsuite_get_min_symmetric_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->min_symmetric_keylength;
 }
 
 AXIS2_EXTERN int AXIS2_CALL
 rp_algorithmsuite_get_encryption_derivation_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->encryption_key_derivation_keylength;
 }
 
 AXIS2_EXTERN int AXIS2_CALL
 rp_algorithmsuite_get_signature_derivation_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->signature_key_derivation_keylength;
 }
 
 AXIS2_EXTERN int AXIS2_CALL
 rp_algorithmsuite_get_max_asymmetric_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->max_asymmetric_keylength;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_max_asymmetric_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
     int max_asymmetric_keylength)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     algorithmsuite->max_asymmetric_keylength = max_asymmetric_keylength;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN int AXIS2_CALL
 rp_algorithmsuite_get_min_asymmetric_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->min_asymmetric_keylength;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_min_asymmetric_keylength(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
     int min_asymmetric_keylength)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     algorithmsuite->min_asymmetric_keylength = min_asymmetric_keylength;
     return AXIS2_SUCCESS;
-
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_symmetrickeywrap(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->symmetrickeywrap;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_asymmetrickeywrap(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->asymmetrickeywrap;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_signature_key_derivation(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->signature_key_derivation;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_encryption_key_derivation(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->encryption_key_derivation;
-
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_soap_normalization(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->soap_normalization;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_soap_normalization(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
-    axis2_char_t * soap_normalization)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    axis2_char_t *soap_normalization)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, soap_normalization, AXIS2_FAILURE);
-
     algorithmsuite->soap_normalization = soap_normalization;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_str_transformation(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->str_transformation;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_str_transformation(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
-    axis2_char_t * str_transformation)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    axis2_char_t *str_transformation)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, str_transformation, AXIS2_FAILURE);
-
     algorithmsuite->str_transformation = str_transformation;
-
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_c14n(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->c14n;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_c14n(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
-    axis2_char_t * c14n)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    axis2_char_t *c14n)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, c14n, AXIS2_FAILURE);
-
     algorithmsuite->c14n = c14n;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 rp_algorithmsuite_get_xpath(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return algorithmsuite->xpath;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_set_xpath(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env,
-    axis2_char_t * xpath)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    axis2_char_t *xpath)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, xpath, AXIS2_FAILURE);
-
     algorithmsuite->xpath = xpath;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_algorithmsuite_increment_ref(
-    rp_algorithmsuite_t * algorithmsuite,
-    const axutil_env_t * env)
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     algorithmsuite->ref++;
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/asymmetric_binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/asymmetric_binding.c?rev=645779&r1=645778&r2=645779&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/asymmetric_binding.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/asymmetric_binding.c Tue Apr  8 00:09:20
2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -29,7 +28,7 @@
 
 AXIS2_EXTERN rp_asymmetric_binding_t *AXIS2_CALL
 rp_asymmetric_binding_create(
-    const axutil_env_t * env)
+    const axutil_env_t *env)
 {
     rp_asymmetric_binding_t *asymmetric_binding = NULL;
 
@@ -43,6 +42,7 @@
     if (asymmetric_binding == NULL)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     asymmetric_binding->symmetric_asymmetric_binding_commons = NULL;
@@ -56,11 +56,9 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 rp_asymmetric_binding_free(
-    rp_asymmetric_binding_t * asymmetric_binding,
-    const axutil_env_t * env)
+    rp_asymmetric_binding_t *asymmetric_binding,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (asymmetric_binding)
     {
 
@@ -96,22 +94,19 @@
 
 AXIS2_EXTERN rp_symmetric_asymmetric_binding_commons_t *AXIS2_CALL
 rp_asymmetric_binding_get_symmetric_asymmetric_binding_commons(
-    rp_asymmetric_binding_t * asymmetric_binding,
-    const axutil_env_t * env)
+    rp_asymmetric_binding_t *asymmetric_binding,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return asymmetric_binding->symmetric_asymmetric_binding_commons;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_asymmetric_binding_set_symmetric_asymmetric_binding_commons(
-    rp_asymmetric_binding_t * asymmetric_binding,
-    const axutil_env_t * env,
+    rp_asymmetric_binding_t *asymmetric_binding,
+    const axutil_env_t *env,
     rp_symmetric_asymmetric_binding_commons_t *
     symmetric_asymmetric_binding_commons)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, symmetric_asymmetric_binding_commons,
                       AXIS2_FAILURE);
 
@@ -122,60 +117,51 @@
 
 AXIS2_EXTERN rp_property_t *AXIS2_CALL
 rp_asymmetric_binding_get_initiator_token(
-    rp_asymmetric_binding_t * asymmetric_binding,
-    const axutil_env_t * env)
+    rp_asymmetric_binding_t *asymmetric_binding,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return asymmetric_binding->initiator_token;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_asymmetric_binding_set_initiator_token(
-    rp_asymmetric_binding_t * asymmetric_binding,
-    const axutil_env_t * env,
-    rp_property_t * initiator_token)
+    rp_asymmetric_binding_t *asymmetric_binding,
+    const axutil_env_t *env,
+    rp_property_t *initiator_token)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, initiator_token, AXIS2_FAILURE);
 
     rp_property_increment_ref(initiator_token, env);
     asymmetric_binding->initiator_token = initiator_token;
     return AXIS2_SUCCESS;
-
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_asymmetric_binding_set_recipient_token(
-    rp_asymmetric_binding_t * asymmetric_binding,
-    const axutil_env_t * env,
-    rp_property_t * recipient_token)
+    rp_asymmetric_binding_t *asymmetric_binding,
+    const axutil_env_t *env,
+    rp_property_t *recipient_token)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, recipient_token, AXIS2_FAILURE);
 
     rp_property_increment_ref(recipient_token, env);
     asymmetric_binding->recipient_token = recipient_token;
     return AXIS2_SUCCESS;
-
 }
 
 AXIS2_EXTERN rp_property_t *AXIS2_CALL
 rp_asymmetric_binding_get_recipient_token(
-    rp_asymmetric_binding_t * asymmetric_binding,
-    const axutil_env_t * env)
+    rp_asymmetric_binding_t *asymmetric_binding,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return asymmetric_binding->recipient_token;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_asymmetric_binding_increment_ref(
-    rp_asymmetric_binding_t * asymmetric_binding,
-    const axutil_env_t * env)
+    rp_asymmetric_binding_t *asymmetric_binding,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     asymmetric_binding->ref++;
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/binding_commons.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/binding_commons.c?rev=645779&r1=645778&r2=645779&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/binding_commons.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/binding_commons.c Tue Apr  8 00:09:20
2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -31,7 +30,7 @@
 
 AXIS2_EXTERN rp_binding_commons_t *AXIS2_CALL
 rp_binding_commons_create(
-    const axutil_env_t * env)
+    const axutil_env_t *env)
 {
     rp_binding_commons_t *binding_commons = NULL;
 
@@ -44,6 +43,7 @@
     if (binding_commons == NULL)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     binding_commons->algorithmsuite = NULL;
@@ -60,14 +60,11 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 rp_binding_commons_free(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (binding_commons)
     {
-
         if (binding_commons->algorithmsuite)
         {
             rp_algorithmsuite_free(binding_commons->algorithmsuite, env);
@@ -112,18 +109,16 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 rp_binding_commons_get_include_timestamp(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return binding_commons->include_timestamp;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_binding_commons_set_include_timestamp(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env,
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env,
     axis2_bool_t include_timestamp)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -137,21 +132,18 @@
 
 AXIS2_EXTERN rp_algorithmsuite_t *AXIS2_CALL
 rp_binding_commons_get_algorithmsuite(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return binding_commons->algorithmsuite;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_binding_commons_set_algorithmsuite(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env,
-    rp_algorithmsuite_t * algorithmsuite)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env,
+    rp_algorithmsuite_t *algorithmsuite)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, algorithmsuite, AXIS2_FAILURE);
 
     rp_algorithmsuite_increment_ref(algorithmsuite, env);
@@ -161,23 +153,19 @@
 
 AXIS2_EXTERN rp_layout_t *AXIS2_CALL
 rp_binding_commons_get_layout(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return binding_commons->layout;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_binding_commons_set_layout(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env,
-    rp_layout_t * layout)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env,
+    rp_layout_t *layout)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, layout, AXIS2_FAILURE);
-
     rp_layout_increment_ref(layout, env);
     binding_commons->layout = layout;
     return AXIS2_SUCCESS;
@@ -185,44 +173,37 @@
 
 AXIS2_EXTERN rp_supporting_tokens_t *AXIS2_CALL
 rp_binding_commons_get_signed_supporting_tokens(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return binding_commons->signed_supporting_tokens;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_binding_commons_set_signed_supporting_tokens(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env,
-    rp_supporting_tokens_t * signed_supporting_tokens)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env,
+    rp_supporting_tokens_t *signed_supporting_tokens)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, signed_supporting_tokens, AXIS2_FAILURE);
-
     binding_commons->signed_supporting_tokens = signed_supporting_tokens;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN rp_supporting_tokens_t *AXIS2_CALL
 rp_binding_commons_get_signed_endorsing_supporting_tokens(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return binding_commons->signed_endorsing_supporting_tokens;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_binding_commons_set_signed_endorsing_supporting_tokens(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env,
-    rp_supporting_tokens_t * signed_endorsing_supporting_tokens)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env,
+    rp_supporting_tokens_t *signed_endorsing_supporting_tokens)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, signed_endorsing_supporting_tokens,
                       AXIS2_FAILURE);
 
@@ -233,21 +214,18 @@
 
 AXIS2_EXTERN rp_supporting_tokens_t *AXIS2_CALL
 rp_binding_commons_get_endorsing_supporting_tokens(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return binding_commons->endorsing_supporting_tokens;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_binding_commons_set_endorsing_supporting_tokens(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env,
-    rp_supporting_tokens_t * endorsing_supporting_tokens)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env,
+    rp_supporting_tokens_t *endorsing_supporting_tokens)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, endorsing_supporting_tokens, AXIS2_FAILURE);
     binding_commons->endorsing_supporting_tokens = endorsing_supporting_tokens;
     return AXIS2_SUCCESS;
@@ -255,23 +233,19 @@
 
 AXIS2_EXTERN rp_supporting_tokens_t *AXIS2_CALL
 rp_binding_commons_get_supporting_tokens(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return binding_commons->supporting_tokens;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_binding_commons_set_supporting_tokens(
-    rp_binding_commons_t * binding_commons,
-    const axutil_env_t * env,
-    rp_supporting_tokens_t * supporting_tokens)
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env,
+    rp_supporting_tokens_t *supporting_tokens)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, supporting_tokens, AXIS2_FAILURE);
-
     binding_commons->supporting_tokens = supporting_tokens;
     return AXIS2_SUCCESS;
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message