You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ma...@apache.org on 2007/07/23 05:47:09 UTC

svn commit: r558594 [1/2] - in /webservices/axis2/trunk/c/neethi/src: ./ secpolicy/builder/ secpolicy/model/

Author: manjula
Date: Sun Jul 22 20:47:05 2007
New Revision: 558594

URL: http://svn.apache.org/viewvc?view=rev&rev=558594
Log:
This commit includes some error handling stuff and code formatting in neethi.

Modified:
    webservices/axis2/trunk/c/neethi/src/engine.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c
    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
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/element.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/header.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/https_token.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/layout.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/security_context_token.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/supporting_tokens.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_asymmetric_binding_commons.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_binding.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/transport_binding.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/ut.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss10.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss11.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/x509_token.c

Modified: webservices/axis2/trunk/c/neethi/src/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/engine.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/engine.c (original)
+++ webservices/axis2/trunk/c/neethi/src/engine.c Sun Jul 22 20:47:05 2007
@@ -132,6 +132,8 @@
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_ALL_CREATION_FAILED, 
                 AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                "[neethi] All creation failed");
         neethi_all_free(all, env);
         all = NULL;
         return NULL;
@@ -173,6 +175,8 @@
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_EXACTLYONE_CREATION_FAILED,
                 AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                "[neethi] Exactlyone creation failed.");
         neethi_exactlyone_free(exactlyone, env);
         exactlyone = NULL;
         return NULL;
@@ -247,6 +251,8 @@
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_POLICY_CREATION_FAILED,
                 AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                "[neethi] Policy creation failed.");
         neethi_policy_free(neethi_policy, env);
         neethi_policy = NULL;
         return NULL;
@@ -333,7 +339,9 @@
                         if(!namespace)
                         {
                             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_ELEMENT_WITH_NO_NAMESPACE, 
-                                 AXIS2_FAILURE);                        
+                                 AXIS2_FAILURE); 
+                            AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                                "[neethi] Element with no namespace");
                             return AXIS2_FAILURE;
                         }                            
                         uri = axiom_namespace_get_uri(namespace, env);
@@ -341,6 +349,8 @@
                         {
                             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_EMPTY_NAMESPACE_URI, 
                                 AXIS2_FAILURE); 
+                            AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                                "[neethi] Invalid Empty namespace uri.");
                             return AXIS2_FAILURE;
                         }
                         if(axutil_strcmp(uri, NEETHI_NAMESPACE)==0)
@@ -359,6 +369,8 @@
                                 {
                                     AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_POLICY_CREATION_FAILED_FROM_ELEMENT, 
                                         AXIS2_FAILURE);
+                                    AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                                        "[neethi] Policy creation failed from element.");
                                     return AXIS2_FAILURE;
                                 }
                             }
@@ -376,6 +388,8 @@
                                 {
                                     AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_ALL_CREATION_FAILED_FROM_ELEMENT, 
                                         AXIS2_FAILURE);
+                                    AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                                        "[neethi] All creation failed from element.");
                                     return AXIS2_FAILURE;
                                 }
                             }
@@ -393,6 +407,8 @@
                                 {
                                     AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_EXACTLYONE_CREATION_FAILED_FROM_ELEMENT,
                                         AXIS2_FAILURE);
+                                    AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                                        "[neethi] Exactlyone creation failed from element.");
                                     return AXIS2_FAILURE;
                                 }    
                             }
@@ -410,6 +426,8 @@
                                 {
                                     AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_REFERENCE_CREATION_FAILED_FROM_ELEMENT,
                                         AXIS2_FAILURE);
+                                    AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                                        "[neethi] Reference cretion failed from element.");
                                     return AXIS2_FAILURE;
                                 }
                             }
@@ -428,6 +446,8 @@
                             {
                                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_ASSERTION_CREATION_FAILED_FROM_ELEMENT,
                                         AXIS2_FAILURE);
+                                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                                    "[neethi] Assertion creation failed from element.");
                                 return AXIS2_FAILURE;
                             }
                         }                            
@@ -596,7 +616,10 @@
     }        
     else
     {
-        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NORMALIZATION_FAILED, AXIS2_FAILURE);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NORMALIZATION_FAILED, 
+            AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+            "[neethi] Normalization failed.");
         return NULL;
     }
 }
@@ -619,6 +642,8 @@
     if(!exactlyone1 || !exactlyone2)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_WRONG_INPUT_FOR_MERGE, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                "[neethi] Wrong input for merge.");
         return NULL;
     }
     exactlyone = get_cross_product(exactlyone1, exactlyone2, env);
@@ -638,6 +663,8 @@
     else
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_CROSS_PRODUCT_FAILED, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+              "[neethi] Cross product failed.");
         return NULL;
     }
 }
@@ -865,7 +892,10 @@
                 }
                 else
                 {
-                    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NO_CHILDREN_POLICY_COMPONENTS, AXIS2_FAILURE);
+                    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NO_CHILDREN_POLICY_COMPONENTS, 
+                        AXIS2_FAILURE);
+                    AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                        "[neethi] No children policy components");
                     return NULL;
                 }
             }
@@ -885,13 +915,19 @@
             uri = neethi_reference_get_uri(policy_ref, env);
             if(!uri)
             {
-                AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_URI_NOT_SPECIFIED, AXIS2_FAILURE);
+                AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_URI_NOT_SPECIFIED, 
+                     AXIS2_FAILURE);
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                    "[neethi] Uri not specified");
                 return NULL;
             }    
             policy = neethi_registry_lookup(registry, env, uri);
             if(!policy)
             {
-                AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NO_ENTRY_FOR_THE_GIVEN_URI, AXIS2_FAILURE);
+                AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NO_ENTRY_FOR_THE_GIVEN_URI, 
+                    AXIS2_FAILURE);
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                    "[neethi] No entry for the given uri");
                 return NULL;
             }  
             neethi_operator_set_value(child_component, env, policy, OPERATOR_TYPE_POLICY);
@@ -925,7 +961,10 @@
                 }
                 else
                 {
-                    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NO_CHILDREN_POLICY_COMPONENTS, AXIS2_FAILURE);
+                    AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NO_CHILDREN_POLICY_COMPONENTS, 
+                        AXIS2_FAILURE);
+                    AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                        "[neethi] No children policy components");
                     return NULL;
                 }
             }
@@ -968,7 +1007,10 @@
             }
             else
             {
-                AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_EXACTLYONE_NOT_FOUND_IN_NORMALIZED_POLICY, AXIS2_FAILURE);
+                AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_EXACTLYONE_NOT_FOUND_IN_NORMALIZED_POLICY, 
+                        AXIS2_FAILURE);
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                    "[neethi] Exactlyone not found in normalized policy");
                 return NULL;
             }
         }
@@ -984,6 +1026,8 @@
             {
                 AXIS2_ERROR_SET(env->error, 
                                 AXIS2_ERROR_NEETHI_EXACTLYONE_NOT_FOUND_IN_NORMALIZED_POLICY, AXIS2_FAILURE);
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                    "[neethi] Exactlyone not found in normalized policy");
                 return NULL;
             }
             if(!neethi_exactlyone_is_empty(exactlyone, env))
@@ -997,6 +1041,8 @@
                     {
                         AXIS2_ERROR_SET(env->error, 
                                 AXIS2_ERROR_NEETHI_EXACTLYONE_NOT_FOUND_IN_NORMALIZED_POLICY, AXIS2_FAILURE);
+                        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                            "[neethi] Exactlyone not found in normalized policy");
                         return NULL;
                     }
                     if(neethi_exactlyone_is_empty(current_exactlyone, env)) 
@@ -1021,6 +1067,8 @@
             else
             {
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_EXACTLYONE_IS_EMPTY, AXIS2_FAILURE);
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                            "[neethi] Exactlyone is Empty");
                 return NULL;
             }
         }
@@ -1065,6 +1113,8 @@
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_NO_CHILDREN_POLICY_COMPONENTS, 
                 AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+               "[neethi] No children policy components");
         return NULL;
     }
 
@@ -1077,6 +1127,8 @@
         {
             AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_ALL_NOT_FOUND_WHILE_GETTING_CROSS_PRODUCT , 
                 AXIS2_FAILURE);
+            AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                 "[neethi] All not found while getting cross product");
             return NULL;
         }
         
@@ -1089,6 +1141,8 @@
             {
                 AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NEETHI_ALL_NOT_FOUND_WHILE_GETTING_CROSS_PRODUCT ,
                     AXIS2_FAILURE);
+                AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+                    "[neethi] All not found while getting cross product");
                 return NULL;
             }
     

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c Sun Jul 22 20:47:05 2007
@@ -56,10 +56,8 @@
             if(!algosuite_string)
                 return NULL;
             rp_algorithmsuite_set_algosuite(algorithmsuite, env, algosuite_string);
-            /*assertion = neethi_assertion_create(env);
-            neethi_assertion_set_value(assertion, env, algorithmsuite, ASSERTION_TYPE_ALGORITHM_SUITE);
-            */
-            assertion = neethi_assertion_create_with_args(env, (void *)rp_algorithmsuite_free, algorithmsuite, ASSERTION_TYPE_ALGORITHM_SUITE);
+            assertion = neethi_assertion_create_with_args(env, (void *)rp_algorithmsuite_free, 
+                    algorithmsuite, ASSERTION_TYPE_ALGORITHM_SUITE);
             return assertion;
         }
         else return NULL;

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?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/algorithmsuite.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/algorithmsuite.c Sun Jul 22 20:47:05 2007
@@ -80,8 +80,9 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL 
-rp_algorithmsuite_free(rp_algorithmsuite_t *algorithmsuite,
-        const axutil_env_t *env)
+rp_algorithmsuite_free(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
         
@@ -102,8 +103,9 @@
 /* Implementations */
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_algosuite_string(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_algosuite_string(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -116,15 +118,15 @@
 
 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)
+    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;
 
-    if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256)==0)
+    if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC256)==0)
     {
         algorithmsuite->digest = RP_SHA1;
         algorithmsuite->encryption = RP_AES256;
@@ -136,7 +138,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC192)==0)
     {
         algorithmsuite->digest = RP_SHA1;
         algorithmsuite->encryption = RP_AES192;
@@ -148,7 +150,7 @@
 
         return AXIS2_SUCCESS;
     }        
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC128)==0)
     {
         algorithmsuite->digest = RP_SHA1;
         algorithmsuite->encryption = RP_AES128;
@@ -160,7 +162,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_TRIPLE_DES)==0)
     {
         algorithmsuite->digest = RP_SHA1;
         algorithmsuite->encryption = RP_TRIPLE_DES;
@@ -172,7 +174,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_RSA15)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC256_RSA15)==0)
     {
         algorithmsuite->digest = RP_SHA1;
         algorithmsuite->encryption = RP_AES256;
@@ -184,7 +186,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_RSA15)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC192_RSA15)==0)
     {
         algorithmsuite->digest = RP_SHA1;
         algorithmsuite->encryption = RP_AES192;
@@ -196,7 +198,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_RSA15)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC128_RSA15)==0)
     {
         algorithmsuite->digest = RP_SHA1;
         algorithmsuite->encryption = RP_AES128;
@@ -208,7 +210,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_RSA15)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_TRIPLE_DES_RSA15)==0)
     {
         algorithmsuite->digest = RP_SHA1;
         algorithmsuite->encryption = RP_TRIPLE_DES;
@@ -220,7 +222,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_SHA256)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC256_SHA256)==0)
     {
         algorithmsuite->digest = RP_SHA256;
         algorithmsuite->encryption = RP_AES256;
@@ -232,7 +234,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_SHA256)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC192_SHA256)==0)
     {
         algorithmsuite->digest = RP_SHA256;
         algorithmsuite->encryption = RP_AES192;
@@ -244,7 +246,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_SHA256)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC128_SHA256)==0)
     {
         algorithmsuite->digest = RP_SHA256;
         algorithmsuite->encryption = RP_AES128;
@@ -256,7 +258,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_SHA256)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_TRIPLE_DES_SHA256)==0)
     {
         algorithmsuite->digest = RP_SHA256;
         algorithmsuite->encryption = RP_TRIPLE_DES;
@@ -268,7 +270,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC256_SHA256_RSA15)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC256_SHA256_RSA15)==0)
     {
         algorithmsuite->digest = RP_SHA256;
         algorithmsuite->encryption = RP_AES256;
@@ -280,7 +282,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC192_SHA256_RSA15)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC192_SHA256_RSA15)==0)
     {
         algorithmsuite->digest = RP_SHA256;
         algorithmsuite->encryption = RP_AES192;
@@ -292,7 +294,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_BASIC128_SHA256_RSA15)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_BASIC128_SHA256_RSA15)==0)
     {
         algorithmsuite->digest = RP_SHA256;
         algorithmsuite->encryption = RP_AES128;
@@ -304,7 +306,7 @@
 
         return AXIS2_SUCCESS;
     }
-    else if(axutil_strcmp(algosuite_string,RP_ALGO_SUITE_TRIPLE_DES_SHA256_RSA15)==0)
+    else if(axutil_strcmp(algosuite_string, RP_ALGO_SUITE_TRIPLE_DES_SHA256_RSA15)==0)
     {
         algorithmsuite->digest = RP_SHA256;
         algorithmsuite->encryption = RP_TRIPLE_DES;
@@ -322,8 +324,9 @@
 
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_symmetric_signature(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_symmetric_signature(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -332,20 +335,22 @@
 }
 
 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_set_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);
+    AXIS2_PARAM_CHECK(env->error, symmetric_signature, AXIS2_FAILURE);
     
     algorithmsuite->symmetric_signature = symmetric_signature;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_asymmetric_signature(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_asymmetric_signature(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -354,20 +359,22 @@
 }
 
 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_set_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);
+    AXIS2_PARAM_CHECK(env->error, asymmetric_signature, AXIS2_FAILURE);
     
     algorithmsuite->asymmetric_signature = asymmetric_signature;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_computed_key(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_computed_key(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -375,20 +382,22 @@
 }
 
 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_set_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);    
+    AXIS2_PARAM_CHECK(env->error, computed_key, AXIS2_FAILURE);    
     
     algorithmsuite->computed_key = computed_key;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_digest(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_digest(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -396,8 +405,9 @@
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_encryption(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_encryption(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -405,8 +415,9 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL 
-rp_algorithmsuite_get_max_symmetric_keylength(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_max_symmetric_keylength(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -414,9 +425,10 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_algorithmsuite_set_max_symmetric_keylength(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env,
-            int max_symmetric_keylength)
+rp_algorithmsuite_set_max_symmetric_keylength(
+     rp_algorithmsuite_t *algorithmsuite,
+     const axutil_env_t *env,
+     int max_symmetric_keylength)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
@@ -427,8 +439,9 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL 
-rp_algorithmsuite_get_min_symmetric_keylength(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_min_symmetric_keylength(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -436,8 +449,9 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL 
-rp_algorithmsuite_get_max_asymmetric_keylength(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_max_asymmetric_keylength(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -445,9 +459,10 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_algorithmsuite_set_max_asymmetric_keylength(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env,
-            int max_asymmetric_keylength)
+rp_algorithmsuite_set_max_asymmetric_keylength(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    int max_asymmetric_keylength)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
         
@@ -456,8 +471,9 @@
 }
 
 AXIS2_EXTERN int AXIS2_CALL 
-rp_algorithmsuite_get_min_asymmetric_keylength(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_min_asymmetric_keylength(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -465,9 +481,10 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_algorithmsuite_set_min_asymmetric_keylength(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env,
-            int min_asymmetric_keylength)
+rp_algorithmsuite_set_min_asymmetric_keylength(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env,
+    int min_asymmetric_keylength)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -478,8 +495,9 @@
 
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_symmetrickeywrap(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_symmetrickeywrap(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -487,8 +505,9 @@
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_asymmetrickeywrap(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_asymmetrickeywrap(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -496,8 +515,9 @@
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_signature_key_derivation(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_signature_key_derivation(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -505,8 +525,9 @@
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_encryption_key_derivation(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_encryption_key_derivation(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
         
@@ -515,8 +536,9 @@
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_soap_normalization(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_soap_normalization(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -524,20 +546,22 @@
 }
 
 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_set_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);    
+    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_get_str_transformation(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -545,12 +569,13 @@
 }
 
 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_set_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);    
+    AXIS2_PARAM_CHECK(env->error, str_transformation, AXIS2_FAILURE);    
     
     algorithmsuite->str_transformation = str_transformation;
 
@@ -558,8 +583,9 @@
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_algorithmsuite_get_c14n(rp_algorithmsuite_t *algorithmsuite,
-            const axutil_env_t *env)
+rp_algorithmsuite_get_c14n(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -567,20 +593,22 @@
 }
 
 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_set_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);   
+    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_get_xpath(
+    rp_algorithmsuite_t *algorithmsuite,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
         
@@ -588,9 +616,10 @@
 }
 
 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_set_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);
@@ -600,7 +629,8 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_algorithmsuite_increment_ref(rp_algorithmsuite_t *algorithmsuite,
+rp_algorithmsuite_increment_ref(
+    rp_algorithmsuite_t *algorithmsuite,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

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?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/asymmetric_binding.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/asymmetric_binding.c Sun Jul 22 20:47:05 2007
@@ -74,15 +74,15 @@
         }
         if(asymmetric_binding->initiator_token)
         {
-            rp_property_free(asymmetric_binding->initiator_token,env);
+            rp_property_free(asymmetric_binding->initiator_token, env);
             asymmetric_binding->initiator_token = NULL;
         }
         if(asymmetric_binding->recipient_token)
         {
-            rp_property_free(asymmetric_binding->recipient_token,env);            
+            rp_property_free(asymmetric_binding->recipient_token, env);            
             asymmetric_binding->recipient_token = NULL;
         }
-        AXIS2_FREE(env->allocator,asymmetric_binding);           
+        AXIS2_FREE(env->allocator, asymmetric_binding);           
     }
 
     return;
@@ -108,7 +108,8 @@
     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);
+    AXIS2_PARAM_CHECK(env->error, symmetric_asymmetric_binding_commons, 
+            AXIS2_FAILURE);
         
     asymmetric_binding->symmetric_asymmetric_binding_commons
             =symmetric_asymmetric_binding_commons;
@@ -148,7 +149,7 @@
     rp_property_t *recipient_token)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,recipient_token,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, recipient_token, AXIS2_FAILURE);
    
     rp_property_increment_ref(recipient_token, env);
     asymmetric_binding->recipient_token = recipient_token; 

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?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/binding_commons.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/binding_commons.c Sun Jul 22 20:47:05 2007
@@ -57,8 +57,9 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL 
-rp_binding_commons_free(rp_binding_commons_t *binding_commons,
-        const axutil_env_t *env)
+rp_binding_commons_free(
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -67,32 +68,32 @@
         
         if(binding_commons->algorithmsuite)
         {
-            rp_algorithmsuite_free(binding_commons->algorithmsuite,env);
+            rp_algorithmsuite_free(binding_commons->algorithmsuite, env);
             binding_commons->algorithmsuite = NULL;
         }
         if(binding_commons->layout)
         {
-            rp_layout_free(binding_commons->layout,env);
+            rp_layout_free(binding_commons->layout, env);
             binding_commons->layout = NULL;
         }
         if(binding_commons->signed_supporting_tokens)
         {
-            rp_supporting_tokens_free(binding_commons->signed_supporting_tokens,env);
+            rp_supporting_tokens_free(binding_commons->signed_supporting_tokens, env);
             binding_commons->signed_supporting_tokens = NULL;
         }
         if(binding_commons->signed_endorsing_supporting_tokens)
         {
-            rp_supporting_tokens_free(binding_commons->signed_endorsing_supporting_tokens,env);
+            rp_supporting_tokens_free(binding_commons->signed_endorsing_supporting_tokens, env);
             binding_commons->signed_endorsing_supporting_tokens = NULL;
         }      
         if(binding_commons->endorsing_supporting_tokens)
         {
-            rp_supporting_tokens_free(binding_commons->endorsing_supporting_tokens,env);
+            rp_supporting_tokens_free(binding_commons->endorsing_supporting_tokens, env);
             binding_commons->endorsing_supporting_tokens = NULL;
         }
         if(binding_commons->supporting_tokens)
         {
-            rp_supporting_tokens_free(binding_commons->supporting_tokens,env);
+            rp_supporting_tokens_free(binding_commons->supporting_tokens, env);
             binding_commons->supporting_tokens = NULL;
         }            
         AXIS2_FREE(env->allocator,binding_commons);
@@ -106,8 +107,9 @@
 /* Implementations */
 
 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_get_include_timestamp(
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -115,12 +117,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_binding_commons_set_include_timestamp(rp_binding_commons_t *binding_commons,
-            const axutil_env_t *env,
-            axis2_bool_t include_timestamp)
+rp_binding_commons_set_include_timestamp(
+    rp_binding_commons_t *binding_commons,
+    const axutil_env_t *env,
+    axis2_bool_t include_timestamp)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,include_timestamp,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, include_timestamp, AXIS2_FAILURE);
     
     binding_commons->include_timestamp = include_timestamp;
 
@@ -139,12 +142,13 @@
 }
 
 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_set_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);
+    AXIS2_PARAM_CHECK(env->error, algorithmsuite, AXIS2_FAILURE);
 
     rp_algorithmsuite_increment_ref(algorithmsuite, env);
     binding_commons->algorithmsuite = algorithmsuite;    
@@ -163,12 +167,13 @@
 }
 
 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_set_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);
+    AXIS2_PARAM_CHECK(env->error, layout, AXIS2_FAILURE);
 
     rp_layout_increment_ref(layout, env);
     binding_commons->layout = layout;    
@@ -187,12 +192,12 @@
 
 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);
+    AXIS2_PARAM_CHECK(env->error, signed_supporting_tokens, AXIS2_FAILURE);
  
     binding_commons->signed_supporting_tokens = signed_supporting_tokens;
     return AXIS2_SUCCESS;
@@ -210,14 +215,16 @@
 
 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);
+    AXIS2_PARAM_CHECK(env->error, signed_endorsing_supporting_tokens, 
+            AXIS2_FAILURE);
 
-    binding_commons->signed_endorsing_supporting_tokens = signed_endorsing_supporting_tokens;
+    binding_commons->signed_endorsing_supporting_tokens = 
+        signed_endorsing_supporting_tokens;
     return AXIS2_SUCCESS;
 }
 
@@ -238,8 +245,10 @@
             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;
+    AXIS2_PARAM_CHECK(env->error, endorsing_supporting_tokens, 
+            AXIS2_FAILURE);
+    binding_commons->endorsing_supporting_tokens = 
+        endorsing_supporting_tokens;
     return AXIS2_SUCCESS;
 }
 
@@ -255,12 +264,12 @@
 
 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);
+    AXIS2_PARAM_CHECK(env->error, supporting_tokens, AXIS2_FAILURE);
         
     binding_commons->supporting_tokens = supporting_tokens;
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/element.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/element.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/element.c Sun Jul 22 20:47:05 2007
@@ -47,8 +47,9 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL 
-rp_element_free(rp_element_t *element,
-        const axutil_env_t *env)
+rp_element_free(
+    rp_element_t *element,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -64,8 +65,9 @@
 /* Implementations */
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_element_get_name(rp_element_t *element,
-            const axutil_env_t *env)
+rp_element_get_name(
+    rp_element_t *element,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    
@@ -73,12 +75,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_element_set_name(rp_element_t *element,
-            const axutil_env_t *env,
-            axis2_char_t *name)
+rp_element_set_name(
+    rp_element_t *element,
+    const axutil_env_t *env,
+    axis2_char_t *name)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,name,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);   
     
     element->name = name;
     return AXIS2_SUCCESS;
@@ -86,8 +89,9 @@
 
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_element_get_namespace(rp_element_t *element,
-            const axutil_env_t *env)
+rp_element_get_namespace(
+    rp_element_t *element,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -96,12 +100,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_element_set_namespace(rp_element_t *element,
-            const axutil_env_t *env,
-            axis2_char_t *namespace)
+rp_element_set_namespace(
+    rp_element_t *element,
+    const axutil_env_t *env,
+    axis2_char_t *namespace)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,namespace,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, namespace, AXIS2_FAILURE);   
 
     element->namespace = namespace;
 

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/header.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/header.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/header.c Sun Jul 22 20:47:05 2007
@@ -47,8 +47,9 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL 
-rp_header_free(rp_header_t *header,
-        const axutil_env_t *env)
+rp_header_free(
+    rp_header_t *header,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -64,8 +65,9 @@
 /* Implementations */
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_header_get_name(rp_header_t *header,
-            const axutil_env_t *env)
+rp_header_get_name(
+    rp_header_t *header,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
    
@@ -73,12 +75,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_header_set_name(rp_header_t *header,
-            const axutil_env_t *env,
-            axis2_char_t *name)
+rp_header_set_name(
+    rp_header_t *header,
+    const axutil_env_t *env,
+    axis2_char_t *name)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,name,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, name, AXIS2_FAILURE);   
     
     header->name = name;
     return AXIS2_SUCCESS;
@@ -86,8 +89,9 @@
 
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_header_get_namespace(rp_header_t *header,
-            const axutil_env_t *env)
+rp_header_get_namespace(
+    rp_header_t *header,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -97,11 +101,11 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 rp_header_set_namespace(rp_header_t *header,
-            const axutil_env_t *env,
-            axis2_char_t *namespace)
+    const axutil_env_t *env,
+    axis2_char_t *namespace)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,namespace,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, namespace, AXIS2_FAILURE);   
 
     header->namespace = namespace;
 

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/https_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/https_token.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/https_token.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/https_token.c Sun Jul 22 20:47:05 2007
@@ -51,8 +51,9 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL 
-rp_https_token_free(rp_https_token_t *https_token,
-        const axutil_env_t *env)
+rp_https_token_free(
+    rp_https_token_t *https_token,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -72,8 +73,9 @@
 /* Implementations */
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_https_token_get_inclusion(rp_https_token_t *https_token,
-            const axutil_env_t *env)
+rp_https_token_get_inclusion(
+    rp_https_token_t *https_token,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -81,12 +83,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_https_token_set_inclusion(rp_https_token_t *https_token,
-            const axutil_env_t *env,
-            axis2_char_t *inclusion)
+rp_https_token_set_inclusion(
+    rp_https_token_t *https_token,
+    const axutil_env_t *env,
+    axis2_char_t *inclusion)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,inclusion,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, inclusion, AXIS2_FAILURE);
     
     https_token->inclusion = inclusion;
 
@@ -95,8 +98,9 @@
 
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_https_token_get_derivedkeys(rp_https_token_t *https_token,
-            const axutil_env_t *env)
+rp_https_token_get_derivedkeys(
+    rp_https_token_t *https_token,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     
@@ -104,12 +108,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_https_token_set_derivedkeys(rp_https_token_t *https_token,
-            const axutil_env_t *env,
-            axis2_bool_t derivedkeys)
+rp_https_token_set_derivedkeys(
+    rp_https_token_t *https_token,
+    const axutil_env_t *env,
+    axis2_bool_t derivedkeys)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,derivedkeys,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, derivedkeys, AXIS2_FAILURE);
     
     https_token->derivedkeys = derivedkeys;
 
@@ -118,8 +123,9 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_https_token_get_require_client_certificate(rp_https_token_t *https_token,
-            const axutil_env_t *env)
+rp_https_token_get_require_client_certificate(
+    rp_https_token_t *https_token,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -127,12 +133,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_https_token_set_require_client_certificate(rp_https_token_t *https_token,
-            const axutil_env_t *env,
-            axis2_bool_t require_client_certificate)
+rp_https_token_set_require_client_certificate(
+    rp_https_token_t *https_token,
+    const axutil_env_t *env,
+    axis2_bool_t require_client_certificate)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,require_client_certificate,AXIS2_FAILURE)    
+    AXIS2_PARAM_CHECK(env->error, require_client_certificate, AXIS2_FAILURE)    
     https_token->require_client_certificate = require_client_certificate;
 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/layout.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/layout.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/layout.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/layout.c Sun Jul 22 20:47:05 2007
@@ -45,8 +45,9 @@
 }
 
 AXIS2_EXTERN void AXIS2_CALL 
-rp_layout_free(rp_layout_t *layout,
-        const axutil_env_t *env)
+rp_layout_free(
+    rp_layout_t *layout,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
@@ -66,8 +67,9 @@
 /* Implementations */
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL 
-rp_layout_get_value(rp_layout_t *layout,
-            const axutil_env_t *env)
+rp_layout_get_value(
+    rp_layout_t *layout,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
         
@@ -75,19 +77,21 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_layout_set_value(rp_layout_t *layout,
-            const axutil_env_t *env,
-            axis2_char_t *value)
+rp_layout_set_value(
+    rp_layout_t *layout,
+    const axutil_env_t *env,
+    axis2_char_t *value)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,value,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);    
     
     layout->value = value;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_layout_increment_ref(rp_layout_t *layout,
+rp_layout_increment_ref(
+    rp_layout_t *layout,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c Sun Jul 22 20:47:05 2007
@@ -73,62 +73,62 @@
             switch(property->type)
             {                
                 case RP_TOKEN_USERNAME:
-                    rp_username_token_free((rp_username_token_t *)property->value,env);
+                    rp_username_token_free((rp_username_token_t *)property->value, env);
                     property->value = NULL;
                     break;
 
                 case RP_TOKEN_X509:
-                    rp_x509_token_free((rp_x509_token_t *)property->value,env);
+                    rp_x509_token_free((rp_x509_token_t *)property->value, env);
                     property->value = NULL;
                     break;
 
                 case RP_TOKEN_SECURITY_CONTEXT:
-                    rp_security_context_token_free((rp_security_context_token_t *)property->value,env);
+                    rp_security_context_token_free((rp_security_context_token_t *)property->value, env);
                     property->value = NULL;
                     break;
 
                 case RP_TOKEN_HTTPS:
-                    rp_https_token_free((rp_https_token_t *)property->value,env);
+                    rp_https_token_free((rp_https_token_t *)property->value, env);
                     property->value = NULL; 
                     break;                                        
                 
                 case RP_BINDING_SYMMETRIC:
-                    rp_symmetric_binding_free((rp_symmetric_binding_t *)property->value,env);
+                    rp_symmetric_binding_free((rp_symmetric_binding_t *)property->value, env);
                     property->value = NULL;
                     break;
             
                 case RP_BINDING_ASYMMETRIC:
-                    rp_asymmetric_binding_free((rp_asymmetric_binding_t *)property->value,env);
+                    rp_asymmetric_binding_free((rp_asymmetric_binding_t *)property->value, env);
                     property->value = NULL;    
                     break;
                     
                 case RP_BINDING_TRANSPORT:
-                    rp_transport_binding_free((rp_transport_binding_t *)property->value,env);   
+                    rp_transport_binding_free((rp_transport_binding_t *)property->value, env);   
                     property->value = NULL;
                     break;
 
                 case RP_SUPPORTING_SIGNED_SUPPORTING:
-                    rp_supporting_tokens_free((rp_supporting_tokens_t *)property->value,env);
+                    rp_supporting_tokens_free((rp_supporting_tokens_t *)property->value, env);
                     property->value = NULL;
                     break;
 
                 case RP_SUPPORTING_SIGNED_ENDORSING_SUPPORTING:
-                    rp_supporting_tokens_free((rp_supporting_tokens_t *)property->value,env);
+                    rp_supporting_tokens_free((rp_supporting_tokens_t *)property->value, env);
                     property->value = NULL;
                     break;
 
                 case RP_WSS_WSS10:
-                    rp_wss10_free((rp_wss10_t *)property->value,env);
+                    rp_wss10_free((rp_wss10_t *)property->value, env);
                     property->value = NULL;
                     break;
 
                 case RP_WSS_WSS11:
-                    rp_wss11_free((rp_wss11_t *)property->value,env);
+                    rp_wss11_free((rp_wss11_t *)property->value, env);
                     property->value = NULL;
                     break;
             }
         }            
-        AXIS2_FREE(env->allocator,property);           
+        AXIS2_FREE(env->allocator, property);           
     }
 
     return;
@@ -147,13 +147,14 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_property_set_value(rp_property_t *property,
+rp_property_set_value(
+    rp_property_t *property,
     const axutil_env_t *env,
     void *value,
     int type)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,value,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, value, AXIS2_FAILURE);
 
     property->type = type;
 

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c Sun Jul 22 20:47:05 2007
@@ -96,9 +96,10 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_user(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *user)
+rp_rampart_config_set_user(
+        rp_rampart_config_t *rampart_config,
+        const axutil_env_t *env,
+        axis2_char_t *user)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error,user,AXIS2_FAILURE);
@@ -118,12 +119,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_encryption_user(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *encryption_user)
+rp_rampart_config_set_encryption_user(
+    rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *encryption_user)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,encryption_user,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, encryption_user, AXIS2_FAILURE);
         
     rampart_config->encryption_user = encryption_user;
     return AXIS2_SUCCESS;
@@ -140,12 +142,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_password_callback_class(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *password_callback_class)
+rp_rampart_config_set_password_callback_class(
+        rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *password_callback_class)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,password_callback_class,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, password_callback_class, AXIS2_FAILURE);   
         
     rampart_config->password_callback_class = password_callback_class;
     return AXIS2_SUCCESS;
@@ -163,12 +166,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_authenticate_module(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *authenticate_module)
+rp_rampart_config_set_authenticate_module(
+    rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *authenticate_module)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,authenticate_module,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, authenticate_module, AXIS2_FAILURE);   
         
     rampart_config->authenticate_module = authenticate_module;
     return AXIS2_SUCCESS;
@@ -185,12 +189,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_password_type(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *password_type)
+rp_rampart_config_set_password_type(
+    rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *password_type)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,password_type,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, password_type, AXIS2_FAILURE);   
         
     rampart_config->password_type = password_type;
     return AXIS2_SUCCESS;
@@ -208,12 +213,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_private_key_file(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *private_key_file)
+rp_rampart_config_set_private_key_file(
+    rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *private_key_file)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,private_key_file,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, private_key_file, AXIS2_FAILURE);
         
     rampart_config->private_key_file = private_key_file;
     return AXIS2_SUCCESS;
@@ -230,12 +236,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_receiver_certificate_file(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *receiver_certificate_file)
+rp_rampart_config_set_receiver_certificate_file(
+    rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *receiver_certificate_file)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,receiver_certificate_file,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, receiver_certificate_file, AXIS2_FAILURE);   
         
     rampart_config->receiver_certificate_file = receiver_certificate_file;
     return AXIS2_SUCCESS;
@@ -252,12 +259,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_certificate_file(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *certificate_file)
+rp_rampart_config_set_certificate_file(
+    rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *certificate_file)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,certificate_file,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, certificate_file, AXIS2_FAILURE);   
         
     rampart_config->certificate_file = certificate_file;
     return AXIS2_SUCCESS;
@@ -275,12 +283,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_time_to_live(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *time_to_live)
+rp_rampart_config_set_time_to_live(
+    rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *time_to_live)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,time_to_live,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, time_to_live, AXIS2_FAILURE);   
         
     rampart_config->time_to_live = time_to_live;
     return AXIS2_SUCCESS;
@@ -297,9 +306,10 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_rd_val(rp_rampart_config_t *rampart_config,
-            const axutil_env_t *env,
-            axis2_char_t *rd_val)
+rp_rampart_config_set_rd_val(
+    rp_rampart_config_t *rampart_config,
+    const axutil_env_t *env,
+    axis2_char_t *rd_val)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, rd_val, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/security_context_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/security_context_token.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/security_context_token.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/security_context_token.c Sun Jul 22 20:47:05 2007
@@ -93,7 +93,7 @@
     axis2_char_t *inclusion)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,inclusion,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, inclusion, AXIS2_FAILURE);    
 
     security_context_token->inclusion = inclusion;
     return AXIS2_SUCCESS;
@@ -116,7 +116,7 @@
     axis2_bool_t derivedkeys)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,derivedkeys,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, derivedkeys, AXIS2_FAILURE);
 
     security_context_token->derivedkeys = derivedkeys;
     return AXIS2_SUCCESS;
@@ -139,7 +139,7 @@
     axis2_bool_t require_external_uri_ref)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,require_external_uri_ref,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, require_external_uri_ref, AXIS2_FAILURE);
 
     security_context_token->require_external_uri_ref = 
             require_external_uri_ref;
@@ -164,7 +164,7 @@
     axis2_bool_t sc10_security_context_token)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,sc10_security_context_token,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, sc10_security_context_token, AXIS2_FAILURE);
 
     security_context_token->sc10_security_context_token = 
             sc10_security_context_token;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/supporting_tokens.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/supporting_tokens.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/supporting_tokens.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/supporting_tokens.c Sun Jul 22 20:47:05 2007
@@ -167,12 +167,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_supporting_tokens_set_algorithmsuite(rp_supporting_tokens_t *supporting_tokens,
-            const axutil_env_t *env,
-            rp_algorithmsuite_t *algorithmsuite)
+rp_supporting_tokens_set_algorithmsuite(
+    rp_supporting_tokens_t *supporting_tokens,
+    const axutil_env_t *env,
+    rp_algorithmsuite_t *algorithmsuite)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,algorithmsuite,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, algorithmsuite, AXIS2_FAILURE);
 
     rp_algorithmsuite_increment_ref(algorithmsuite, env);
     supporting_tokens->algorithmsuite = algorithmsuite;
@@ -191,12 +192,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_supporting_tokens_set_signed_parts(rp_supporting_tokens_t *supporting_tokens,
-            const axutil_env_t *env,
-            rp_signed_encrypted_parts_t *signed_parts)
+rp_supporting_tokens_set_signed_parts(
+    rp_supporting_tokens_t *supporting_tokens,
+    const axutil_env_t *env,
+    rp_signed_encrypted_parts_t *signed_parts)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,signed_parts,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, signed_parts, AXIS2_FAILURE);
         
     supporting_tokens->signed_parts = signed_parts;
     return AXIS2_SUCCESS;
@@ -213,12 +215,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_supporting_tokens_set_signed_elements(rp_supporting_tokens_t *supporting_tokens,
-            const axutil_env_t *env,
-            rp_signed_encrypted_elements_t *signed_elements)
+rp_supporting_tokens_set_signed_elements(
+    rp_supporting_tokens_t *supporting_tokens,
+    const axutil_env_t *env,
+    rp_signed_encrypted_elements_t *signed_elements)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,signed_elements,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, signed_elements, AXIS2_FAILURE);
         
     supporting_tokens->signed_elements = signed_elements;
     return AXIS2_SUCCESS;
@@ -235,12 +238,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_supporting_tokens_set_encrypted_parts(rp_supporting_tokens_t *supporting_tokens,
-            const axutil_env_t *env,
-            rp_signed_encrypted_parts_t *encrypted_parts)
+rp_supporting_tokens_set_encrypted_parts(
+    rp_supporting_tokens_t *supporting_tokens,
+    const axutil_env_t *env,
+    rp_signed_encrypted_parts_t *encrypted_parts)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,encrypted_parts,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, encrypted_parts, AXIS2_FAILURE);
 
     supporting_tokens->encrypted_parts = encrypted_parts;
     return AXIS2_SUCCESS;
@@ -257,12 +261,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_supporting_tokens_set_encrypted_elements(rp_supporting_tokens_t *supporting_tokens,
-            const axutil_env_t *env,
-            rp_signed_encrypted_elements_t *encrypted_elements)
+rp_supporting_tokens_set_encrypted_elements(
+    rp_supporting_tokens_t *supporting_tokens,
+    const axutil_env_t *env,
+    rp_signed_encrypted_elements_t *encrypted_elements)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,encrypted_elements,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, encrypted_elements, AXIS2_FAILURE);
         
     supporting_tokens->encrypted_elements = encrypted_elements;
     return AXIS2_SUCCESS;
@@ -279,9 +284,10 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_supporting_tokens_set_type(rp_supporting_tokens_t *supporting_tokens,
-            const axutil_env_t *env,
-            int type)
+rp_supporting_tokens_set_type(
+    rp_supporting_tokens_t *supporting_tokens,
+    const axutil_env_t *env,
+    int type)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     supporting_tokens->type = type;
@@ -289,7 +295,8 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_supporting_tokens_increment_ref(rp_supporting_tokens_t *supporting_tokens,
+rp_supporting_tokens_increment_ref(
+    rp_supporting_tokens_t *supporting_tokens,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_asymmetric_binding_commons.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_asymmetric_binding_commons.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_asymmetric_binding_commons.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_asymmetric_binding_commons.c Sun Jul 22 20:47:05 2007
@@ -92,9 +92,10 @@
     rp_binding_commons_t *binding_commons)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,binding_commons,AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, binding_commons, AXIS2_FAILURE);   
         
-    symmetric_asymmetric_binding_commons->binding_commons=binding_commons;    
+    symmetric_asymmetric_binding_commons->binding_commons = 
+        binding_commons;    
     return AXIS2_SUCCESS;
 }
 
@@ -140,7 +141,7 @@
     axis2_bool_t token_protection)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,token_protection,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, token_protection, AXIS2_FAILURE);
 
     symmetric_asymmetric_binding_commons->token_protection = token_protection;
     return AXIS2_SUCCESS;
@@ -163,7 +164,7 @@
     axis2_bool_t entire_headers_and_body_signatures)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,entire_headers_and_body_signatures,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, entire_headers_and_body_signatures, AXIS2_FAILURE);
 
     symmetric_asymmetric_binding_commons->entire_headers_and_body_signatures = 
         entire_headers_and_body_signatures;
@@ -188,9 +189,10 @@
     axis2_char_t *protection_order)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,protection_order,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, protection_order, AXIS2_FAILURE);
     
-    symmetric_asymmetric_binding_commons->protection_order = protection_order;    
+    symmetric_asymmetric_binding_commons->protection_order = 
+        protection_order;    
     return AXIS2_SUCCESS;
 }
 

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_binding.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_binding.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_binding.c Sun Jul 22 20:47:05 2007
@@ -114,7 +114,8 @@
     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);
+    AXIS2_PARAM_CHECK(env->error, symmetric_asymmetric_binding_commons,
+            AXIS2_FAILURE);
         
     symmetric_binding->symmetric_asymmetric_binding_commons
             =symmetric_asymmetric_binding_commons;
@@ -149,7 +150,8 @@
     {
         return AXIS2_FAILURE;
     }
-    symmetric_binding->protection_token=protection_token; 
+    symmetric_binding->protection_token = 
+        protection_token; 
 
     return AXIS2_SUCCESS;
     

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/transport_binding.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/transport_binding.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/transport_binding.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/transport_binding.c Sun Jul 22 20:47:05 2007
@@ -65,7 +65,7 @@
         if(transport_binding->binding_commons)
         {
             rp_binding_commons_free(transport_binding->binding_commons,env);
-            transport_binding->binding_commons=NULL;
+            transport_binding->binding_commons = NULL;
         }
         if(transport_binding->transport_token)
         {
@@ -98,7 +98,7 @@
     rp_binding_commons_t *binding_commons)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,binding_commons,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, binding_commons, AXIS2_FAILURE);
         
     transport_binding->binding_commons=binding_commons;
     return AXIS2_SUCCESS;
@@ -123,7 +123,7 @@
     rp_property_t *transport_token)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,transport_token,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, transport_token, AXIS2_FAILURE);
     
     transport_binding->transport_token = transport_token; 
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/ut.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/ut.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/ut.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/ut.c Sun Jul 22 20:47:05 2007
@@ -93,7 +93,7 @@
     axis2_char_t *inclusion)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,inclusion,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, inclusion, AXIS2_FAILURE);
     
     username_token->inclusion = inclusion;
 
@@ -118,7 +118,7 @@
     axis2_bool_t derivedkeys)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-     AXIS2_PARAM_CHECK(env->error,derivedkeys,AXIS2_FAILURE);    
+     AXIS2_PARAM_CHECK(env->error, derivedkeys, AXIS2_FAILURE);    
     username_token->derivedkeys = derivedkeys;
 
     return AXIS2_SUCCESS;
@@ -143,7 +143,7 @@
     axis2_bool_t useUTprofile10)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,useUTprofile10,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, useUTprofile10, AXIS2_FAILURE);
     username_token->useUTprofile10 = useUTprofile10;
 
     return AXIS2_SUCCESS;
@@ -166,14 +166,15 @@
     axis2_bool_t useUTprofile11)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,useUTprofile11,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, useUTprofile11, AXIS2_FAILURE);    
     username_token->useUTprofile11 = useUTprofile11;
 
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_username_token_increment_ref(rp_username_token_t *username_token,
+rp_username_token_increment_ref(
+    rp_username_token_t *username_token,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss10.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss10.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss10.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss10.c Sun Jul 22 20:47:05 2007
@@ -77,8 +77,9 @@
 
 /* Implementations */
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss10_get_must_support_ref_key_identifier(rp_wss10_t *wss10,
-            const axutil_env_t *env)
+rp_wss10_get_must_support_ref_key_identifier(
+    rp_wss10_t *wss10,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
         
@@ -86,12 +87,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss10_set_must_support_ref_key_identifier(rp_wss10_t *wss10,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_key_identifier)
+rp_wss10_set_must_support_ref_key_identifier(
+    rp_wss10_t *wss10,
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_key_identifier)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_key_identifier,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_key_identifier, AXIS2_FAILURE);    
     wss10->must_support_ref_key_identifier = must_support_ref_key_identifier;
 
     return AXIS2_SUCCESS;
@@ -99,8 +101,9 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss10_get_must_support_ref_issuer_serial(rp_wss10_t *wss10,
-            const axutil_env_t *env)
+rp_wss10_get_must_support_ref_issuer_serial(
+    rp_wss10_t *wss10,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     
@@ -108,20 +111,22 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss10_set_must_support_ref_issuer_serial(rp_wss10_t *wss10,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_issuer_serial)
+rp_wss10_set_must_support_ref_issuer_serial(
+    rp_wss10_t *wss10,
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_issuer_serial)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_issuer_serial,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_issuer_serial, AXIS2_FAILURE);    
     wss10->must_support_ref_issuer_serial = must_support_ref_issuer_serial;
 
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss10_get_must_support_ref_external_uri(rp_wss10_t *wss10,
-            const axutil_env_t *env)
+rp_wss10_get_must_support_ref_external_uri(
+    rp_wss10_t *wss10,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     
@@ -130,19 +135,20 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 rp_wss10_set_must_support_ref_external_uri(rp_wss10_t *wss10,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_external_uri)
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_external_uri)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_external_uri,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_external_uri, AXIS2_FAILURE);    
     wss10->must_support_ref_external_uri = must_support_ref_external_uri;
 
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss10_get_must_support_ref_embedded_token(rp_wss10_t *wss10,
-            const axutil_env_t *env)
+rp_wss10_get_must_support_ref_embedded_token(
+    rp_wss10_t *wss10,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
         
@@ -151,11 +157,11 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 rp_wss10_set_must_support_ref_embedded_token(rp_wss10_t *wss10,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_embedded_token)
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_embedded_token)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_embedded_token,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_embedded_token, AXIS2_FAILURE);    
     wss10->must_support_ref_embedded_token = must_support_ref_embedded_token;
 
     return AXIS2_SUCCESS;
@@ -163,7 +169,8 @@
 
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_wss10_increment_ref(rp_wss10_t *wss10,
+rp_wss10_increment_ref(
+    rp_wss10_t *wss10,
     const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss11.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss11.c?view=diff&rev=558594&r1=558593&r2=558594
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss11.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss11.c Sun Jul 22 20:47:05 2007
@@ -82,8 +82,9 @@
 
 /* Implementations */
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss11_get_must_support_ref_key_identifier(rp_wss11_t *wss11,
-            const axutil_env_t *env)
+rp_wss11_get_must_support_ref_key_identifier(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     
@@ -91,12 +92,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss11_set_must_support_ref_key_identifier(rp_wss11_t *wss11,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_key_identifier)
+rp_wss11_set_must_support_ref_key_identifier(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_key_identifier)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_key_identifier,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_key_identifier, AXIS2_FAILURE);
     wss11->must_support_ref_key_identifier = must_support_ref_key_identifier;
 
     return AXIS2_SUCCESS;
@@ -104,8 +106,9 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss11_get_must_support_ref_issuer_serial(rp_wss11_t *wss11,
-            const axutil_env_t *env)
+rp_wss11_get_must_support_ref_issuer_serial(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     
@@ -113,12 +116,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss11_set_must_support_ref_issuer_serial(rp_wss11_t *wss11,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_issuer_serial)
+rp_wss11_set_must_support_ref_issuer_serial(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_issuer_serial)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_issuer_serial,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_issuer_serial, AXIS2_FAILURE);    
     wss11->must_support_ref_issuer_serial = must_support_ref_issuer_serial;
 
     return AXIS2_SUCCESS;
@@ -126,8 +130,9 @@
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss11_get_must_support_ref_external_uri(rp_wss11_t *wss11,
-            const axutil_env_t *env)
+rp_wss11_get_must_support_ref_external_uri(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
         
@@ -136,20 +141,22 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss11_set_must_support_ref_external_uri(rp_wss11_t *wss11,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_external_uri)
+rp_wss11_set_must_support_ref_external_uri(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_external_uri)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_external_uri,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_external_uri, AXIS2_FAILURE);    
     wss11->must_support_ref_external_uri = must_support_ref_external_uri;
 
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss11_get_must_support_ref_embedded_token(rp_wss11_t *wss11,
-            const axutil_env_t *env)
+rp_wss11_get_must_support_ref_embedded_token(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
         
@@ -157,12 +164,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss11_set_must_support_ref_embedded_token(rp_wss11_t *wss11,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_embedded_token)
+rp_wss11_set_must_support_ref_embedded_token(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_embedded_token)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_embedded_token,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_embedded_token, AXIS2_FAILURE);    
     wss11->must_support_ref_embedded_token = must_support_ref_embedded_token;
 
     return AXIS2_SUCCESS;
@@ -170,8 +178,9 @@
 
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss11_get_must_support_ref_thumbprint(rp_wss11_t *wss11,
-            const axutil_env_t *env)
+rp_wss11_get_must_support_ref_thumbprint(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
         
@@ -179,20 +188,22 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss11_set_must_support_must_support_ref_thumbprint(rp_wss11_t *wss11,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_thumbprint)
+rp_wss11_set_must_support_must_support_ref_thumbprint(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_thumbprint)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_thumbprint,AXIS2_FAILURE);
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_thumbprint, AXIS2_FAILURE);
     wss11->must_support_ref_thumbprint = must_support_ref_thumbprint;
 
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss11_get_must_support_ref_encryptedkey(rp_wss11_t *wss11,
-            const axutil_env_t *env)
+rp_wss11_get_must_support_ref_encryptedkey(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
     
@@ -200,12 +211,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss11_set_must_support_ref_encryptedkey(rp_wss11_t *wss11,
-            const axutil_env_t *env,
-            axis2_bool_t must_support_ref_encryptedkey)
+rp_wss11_set_must_support_ref_encryptedkey(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env,
+    axis2_bool_t must_support_ref_encryptedkey)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,must_support_ref_encryptedkey,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, must_support_ref_encryptedkey, AXIS2_FAILURE);    
     wss11->must_support_ref_encryptedkey = must_support_ref_encryptedkey;
 
     return AXIS2_SUCCESS;
@@ -214,8 +226,9 @@
 
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL 
-rp_wss11_get_require_signature_confirmation(rp_wss11_t *wss11,
-            const axutil_env_t *env)
+rp_wss11_get_require_signature_confirmation(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FALSE);
         
@@ -223,12 +236,13 @@
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
-rp_wss11_set_require_signature_confirmation(rp_wss11_t *wss11,
-            const axutil_env_t *env,
-            axis2_bool_t require_signature_confirmation)
+rp_wss11_set_require_signature_confirmation(
+    rp_wss11_t *wss11,
+    const axutil_env_t *env,
+    axis2_bool_t require_signature_confirmation)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error,require_signature_confirmation,AXIS2_FAILURE);    
+    AXIS2_PARAM_CHECK(env->error, require_signature_confirmation, AXIS2_FAILURE);    
     wss11->require_signature_confirmation = require_signature_confirmation;
 
     return AXIS2_SUCCESS;



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