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 sh...@apache.org on 2009/08/18 12:45:18 UTC
svn commit: r805352 [5/5] - in /webservices/axis2/trunk/c/neethi/src: ./
rmpolicy/ secpolicy/builder/ secpolicy/model/
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/signed_encrypted_items.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/signed_encrypted_items.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/signed_encrypted_items.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/signed_encrypted_items.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,12 +32,10 @@
AXIS2_ENV_CHECK(env, NULL);
- signed_encrypted_items =
- (rp_signed_encrypted_items_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (rp_signed_encrypted_items_t));
+ signed_encrypted_items = (rp_signed_encrypted_items_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(rp_signed_encrypted_items_t));
- if (signed_encrypted_items == NULL)
+ if(signed_encrypted_items == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -46,7 +43,7 @@
signed_encrypted_items->elements = NULL;
signed_encrypted_items->elements = axutil_array_list_create(env, 0);
- if (!(signed_encrypted_items->elements))
+ if(!(signed_encrypted_items->elements))
{
rp_signed_encrypted_items_free(signed_encrypted_items, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -64,21 +61,18 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (signed_encrypted_items)
+ if(signed_encrypted_items)
{
- if (signed_encrypted_items->elements)
+ if(signed_encrypted_items->elements)
{
int i = 0;
- for (i = 0;
- i < axutil_array_list_size(signed_encrypted_items->elements,
- env); i++)
+ for(i = 0; i < axutil_array_list_size(signed_encrypted_items->elements, env); i++)
{
rp_element_t *element = NULL;
- element = (rp_element_t *)
- axutil_array_list_get(signed_encrypted_items->elements, env,
- i);
- if (element)
+ element = (rp_element_t *)axutil_array_list_get(signed_encrypted_items->elements,
+ env, i);
+ if(element)
rp_element_free(element, env);
element = NULL;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/signed_encrypted_parts.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/signed_encrypted_parts.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/signed_encrypted_parts.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/signed_encrypted_parts.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,22 +31,22 @@
const axutil_env_t * env)
{
rp_signed_encrypted_parts_t *signed_encrypted_parts = NULL;
- signed_encrypted_parts = (rp_signed_encrypted_parts_t *) AXIS2_MALLOC(
- env->allocator, sizeof(rp_signed_encrypted_parts_t));
+ signed_encrypted_parts = (rp_signed_encrypted_parts_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(rp_signed_encrypted_parts_t));
if(!signed_encrypted_parts)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Cannot create signed_encrypted_parts. Insuficient memory.");
return NULL;
}
signed_encrypted_parts->headers = axutil_array_list_create(env, 0);
- if (!signed_encrypted_parts->headers)
+ if(!signed_encrypted_parts->headers)
{
rp_signed_encrypted_parts_free(signed_encrypted_parts, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Cannot create signed_encrypted_parts. Headers array list creation failed.");
return NULL;
}
@@ -64,22 +63,22 @@
rp_signed_encrypted_parts_t * signed_encrypted_parts,
const axutil_env_t * env)
{
- if (signed_encrypted_parts)
+ if(signed_encrypted_parts)
{
- if (--(signed_encrypted_parts->ref) > 0)
+ if(--(signed_encrypted_parts->ref) > 0)
{
return;
}
- if (signed_encrypted_parts->headers)
+ if(signed_encrypted_parts->headers)
{
int i = 0;
- for (i = 0; i < axutil_array_list_size(signed_encrypted_parts->headers, env); i++)
+ for(i = 0; i < axutil_array_list_size(signed_encrypted_parts->headers, env); i++)
{
rp_header_t *header = NULL;
- header = (rp_header_t *)axutil_array_list_get(
- signed_encrypted_parts->headers, env, i);
- if (header)
+ header = (rp_header_t *)axutil_array_list_get(signed_encrypted_parts->headers, env,
+ i);
+ if(header)
{
rp_header_free(header, env);
}
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?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/supporting_tokens.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/supporting_tokens.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -38,18 +37,17 @@
AXIS2_ENV_CHECK(env, NULL);
- supporting_tokens = (rp_supporting_tokens_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (rp_supporting_tokens_t));
+ supporting_tokens = (rp_supporting_tokens_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(rp_supporting_tokens_t));
- if (supporting_tokens == NULL)
+ if(supporting_tokens == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
supporting_tokens->tokens = NULL;
supporting_tokens->tokens = axutil_array_list_create(env, 0);
- if (!(supporting_tokens->tokens))
+ if(!(supporting_tokens->tokens))
{
rp_supporting_tokens_free(supporting_tokens, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -73,24 +71,22 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (supporting_tokens)
+ if(supporting_tokens)
{
- if (--(supporting_tokens->ref) > 0)
+ if(--(supporting_tokens->ref) > 0)
{
return;
}
- if (supporting_tokens->tokens)
+ if(supporting_tokens->tokens)
{
int i = 0;
- for (i = 0; i < axutil_array_list_size(supporting_tokens->tokens,
- env); i++)
+ for(i = 0; i < axutil_array_list_size(supporting_tokens->tokens, env); i++)
{
rp_property_t *token = NULL;
- token = (rp_property_t *)
- axutil_array_list_get(supporting_tokens->tokens, env, i);
- if (token)
+ token = (rp_property_t *)axutil_array_list_get(supporting_tokens->tokens, env, i);
+ if(token)
rp_property_free(token, env);
token = NULL;
@@ -99,33 +95,29 @@
supporting_tokens->tokens = NULL;
}
- if (supporting_tokens->algorithmsuite)
+ if(supporting_tokens->algorithmsuite)
{
rp_algorithmsuite_free(supporting_tokens->algorithmsuite, env);
supporting_tokens->algorithmsuite = NULL;
}
- if (supporting_tokens->signed_parts)
+ if(supporting_tokens->signed_parts)
{
- rp_signed_encrypted_parts_free(supporting_tokens->signed_parts,
- env);
+ rp_signed_encrypted_parts_free(supporting_tokens->signed_parts, env);
supporting_tokens->signed_parts = NULL;
}
- if (supporting_tokens->signed_elements)
+ if(supporting_tokens->signed_elements)
{
- rp_signed_encrypted_elements_free(supporting_tokens->
- signed_elements, env);
+ rp_signed_encrypted_elements_free(supporting_tokens-> signed_elements, env);
supporting_tokens->signed_elements = NULL;
}
- if (supporting_tokens->encrypted_parts)
+ if(supporting_tokens->encrypted_parts)
{
- rp_signed_encrypted_parts_free(supporting_tokens->encrypted_parts,
- env);
+ rp_signed_encrypted_parts_free(supporting_tokens->encrypted_parts, env);
supporting_tokens->encrypted_parts = NULL;
}
- if (supporting_tokens->encrypted_elements)
+ if(supporting_tokens->encrypted_elements)
{
- rp_signed_encrypted_elements_free(supporting_tokens->
- encrypted_elements, env);
+ rp_signed_encrypted_elements_free(supporting_tokens-> encrypted_elements, env);
supporting_tokens->encrypted_elements = NULL;
}
AXIS2_FREE(env->allocator, supporting_tokens);
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?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- 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 Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,47 +31,40 @@
rp_symmetric_asymmetric_binding_commons_create(
const axutil_env_t * env)
{
- rp_symmetric_asymmetric_binding_commons_t
- *symmetric_asymmetric_binding_commons = NULL;
+ rp_symmetric_asymmetric_binding_commons_t *symmetric_asymmetric_binding_commons = NULL;
AXIS2_ENV_CHECK(env, NULL);
- symmetric_asymmetric_binding_commons =
- (rp_symmetric_asymmetric_binding_commons_t *) AXIS2_MALLOC(env->
- allocator,
- sizeof
- (rp_symmetric_asymmetric_binding_commons_t));
+ symmetric_asymmetric_binding_commons
+ = (rp_symmetric_asymmetric_binding_commons_t *)AXIS2_MALLOC(env-> allocator,
+ sizeof(rp_symmetric_asymmetric_binding_commons_t));
- if (symmetric_asymmetric_binding_commons == NULL)
+ if(symmetric_asymmetric_binding_commons == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
symmetric_asymmetric_binding_commons->binding_commons = NULL;
- symmetric_asymmetric_binding_commons->protection_order =
- RP_SIGN_BEFORE_ENCRYPTING;
+ symmetric_asymmetric_binding_commons->protection_order = RP_SIGN_BEFORE_ENCRYPTING;
symmetric_asymmetric_binding_commons->signature_protection = AXIS2_FALSE;
symmetric_asymmetric_binding_commons->token_protection = AXIS2_FALSE;
- symmetric_asymmetric_binding_commons->entire_headers_and_body_signatures =
- AXIS2_FALSE;
+ symmetric_asymmetric_binding_commons->entire_headers_and_body_signatures = AXIS2_FALSE;
return symmetric_asymmetric_binding_commons;
}
AXIS2_EXTERN void AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_free(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (symmetric_asymmetric_binding_commons)
+ if(symmetric_asymmetric_binding_commons)
{
- if (symmetric_asymmetric_binding_commons->binding_commons)
+ if(symmetric_asymmetric_binding_commons->binding_commons)
{
- rp_binding_commons_free(symmetric_asymmetric_binding_commons->
- binding_commons, env);
+ rp_binding_commons_free(symmetric_asymmetric_binding_commons-> binding_commons, env);
symmetric_asymmetric_binding_commons->binding_commons = NULL;
}
AXIS2_FREE(env->allocator, symmetric_asymmetric_binding_commons);
@@ -84,8 +76,7 @@
/* Implementations */
AXIS2_EXTERN rp_binding_commons_t *AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_get_binding_commons(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -95,8 +86,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_set_binding_commons(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env,
rp_binding_commons_t * binding_commons)
{
@@ -109,8 +99,7 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_get_signature_protection(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -120,23 +109,20 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_set_signature_protection(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env,
axis2_bool_t signature_protection)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, signature_protection, AXIS2_FAILURE);
- symmetric_asymmetric_binding_commons->signature_protection =
- signature_protection;
+ symmetric_asymmetric_binding_commons->signature_protection = signature_protection;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_get_token_protection(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
@@ -146,8 +132,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_set_token_protection(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env,
axis2_bool_t token_protection)
{
@@ -160,37 +145,32 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_get_entire_headers_and_body_signatures(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FALSE);
- return symmetric_asymmetric_binding_commons->
- entire_headers_and_body_signatures;
+ return symmetric_asymmetric_binding_commons-> entire_headers_and_body_signatures;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_set_entire_headers_and_body_signatures(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env,
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;
+ symmetric_asymmetric_binding_commons->entire_headers_and_body_signatures
+ = entire_headers_and_body_signatures;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_get_protection_order(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -200,8 +180,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rp_symmetric_asymmetric_binding_commons_set_protection_order(
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons,
+ rp_symmetric_asymmetric_binding_commons_t * symmetric_asymmetric_binding_commons,
const axutil_env_t * env,
axis2_char_t * protection_order)
{
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?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_binding.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/symmetric_binding.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -20,8 +19,7 @@
struct rp_symmetric_binding_t
{
- rp_symmetric_asymmetric_binding_commons_t
- *symmetric_asymmetric_binding_commons;
+ rp_symmetric_asymmetric_binding_commons_t *symmetric_asymmetric_binding_commons;
rp_property_t *protection_token;
rp_property_t *signature_token;
rp_property_t *encryption_token;
@@ -36,11 +34,10 @@
AXIS2_ENV_CHECK(env, NULL);
- symmetric_binding = (rp_symmetric_binding_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (rp_symmetric_binding_t));
+ symmetric_binding = (rp_symmetric_binding_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(rp_symmetric_binding_t));
- if (symmetric_binding == NULL)
+ if(symmetric_binding == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -61,31 +58,30 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (symmetric_binding)
+ if(symmetric_binding)
{
- if (--(symmetric_binding->ref) > 0)
+ if(--(symmetric_binding->ref) > 0)
{
return;
}
- if (symmetric_binding->symmetric_asymmetric_binding_commons)
+ if(symmetric_binding->symmetric_asymmetric_binding_commons)
{
- rp_symmetric_asymmetric_binding_commons_free(symmetric_binding->
- symmetric_asymmetric_binding_commons,
- env);
+ rp_symmetric_asymmetric_binding_commons_free(
+ symmetric_binding-> symmetric_asymmetric_binding_commons, env);
symmetric_binding->symmetric_asymmetric_binding_commons = NULL;
}
- if (symmetric_binding->protection_token)
+ if(symmetric_binding->protection_token)
{
rp_property_free(symmetric_binding->protection_token, env);
symmetric_binding->protection_token = NULL;
}
- if (symmetric_binding->encryption_token)
+ if(symmetric_binding->encryption_token)
{
rp_property_free(symmetric_binding->encryption_token, env);
symmetric_binding->encryption_token = NULL;
}
- if (symmetric_binding->signature_token)
+ if(symmetric_binding->signature_token)
{
rp_property_free(symmetric_binding->signature_token, env);
symmetric_binding->signature_token = NULL;
@@ -112,15 +108,12 @@
rp_symmetric_binding_set_symmetric_asymmetric_binding_commons(
rp_symmetric_binding_t * symmetric_binding,
const axutil_env_t * env,
- rp_symmetric_asymmetric_binding_commons_t *
- symmetric_asymmetric_binding_commons)
+ 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;
+ symmetric_binding->symmetric_asymmetric_binding_commons = symmetric_asymmetric_binding_commons;
return AXIS2_SUCCESS;
}
@@ -143,8 +136,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, protection_token, AXIS2_FAILURE);
- if (symmetric_binding->signature_token ||
- symmetric_binding->encryption_token)
+ if(symmetric_binding->signature_token || symmetric_binding->encryption_token)
{
return AXIS2_FAILURE;
}
@@ -163,7 +155,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, encryption_token, AXIS2_FAILURE);
- if (symmetric_binding->protection_token)
+ if(symmetric_binding->protection_token)
{
return AXIS2_FAILURE;
}
@@ -192,7 +184,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, signature_token, AXIS2_FAILURE);
- if (symmetric_binding->protection_token)
+ if(symmetric_binding->protection_token)
{
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/token.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/token.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/token.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -34,12 +33,12 @@
const axutil_env_t * env)
{
rp_token_t *token = NULL;
- token = (rp_token_t *) AXIS2_MALLOC(env->allocator, sizeof (rp_token_t));
+ token = (rp_token_t *)AXIS2_MALLOC(env->allocator, sizeof(rp_token_t));
- if (!token)
+ if(!token)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] Token creation failed. Insufficient memory");
return NULL;
}
@@ -59,9 +58,9 @@
rp_token_t * token,
const axutil_env_t * env)
{
- if (token)
+ if(token)
{
- if (--(token->ref) > 0)
+ if(--(token->ref) > 0)
{
return;
}
@@ -93,8 +92,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rp_token_set_derive_key_version(
- rp_token_t *token,
- const axutil_env_t *env,
+ rp_token_t *token,
+ const axutil_env_t *env,
derive_key_version_t version)
{
token->derive_key_version = version;
@@ -103,7 +102,7 @@
AXIS2_EXTERN derive_key_version_t AXIS2_CALL
rp_token_get_derive_key_version(
- rp_token_t *token,
+ rp_token_t *token,
const axutil_env_t *env)
{
return token->derive_key_version;
@@ -111,8 +110,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rp_token_set_inclusion(
- rp_token_t *token,
- const axutil_env_t *env,
+ rp_token_t *token,
+ const axutil_env_t *env,
axis2_char_t *inclusion)
{
token->inclusion = inclusion;
@@ -121,7 +120,7 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rp_token_get_inclusion(
- rp_token_t *token,
+ rp_token_t *token,
const axutil_env_t *env)
{
return token->inclusion;
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?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/transport_binding.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/transport_binding.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -33,11 +32,10 @@
AXIS2_ENV_CHECK(env, NULL);
- transport_binding = (rp_transport_binding_t *) AXIS2_MALLOC(env->allocator,
- sizeof
- (rp_transport_binding_t));
+ transport_binding = (rp_transport_binding_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(rp_transport_binding_t));
- if (transport_binding == NULL)
+ if(transport_binding == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -57,18 +55,18 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (transport_binding)
+ if(transport_binding)
{
- if (--(transport_binding->ref) > 0)
+ if(--(transport_binding->ref) > 0)
{
return;
}
- if (transport_binding->binding_commons)
+ if(transport_binding->binding_commons)
{
rp_binding_commons_free(transport_binding->binding_commons, env);
transport_binding->binding_commons = NULL;
}
- if (transport_binding->transport_token)
+ if(transport_binding->transport_token)
{
rp_property_free(transport_binding->transport_token, env);
transport_binding->transport_token = NULL;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/trust10.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/trust10.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/trust10.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/trust10.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -36,9 +35,9 @@
AXIS2_ENV_CHECK(env, NULL);
- trust10 = (rp_trust10_t *) AXIS2_MALLOC(env->allocator, sizeof(rp_trust10_t));
+ trust10 = (rp_trust10_t *)AXIS2_MALLOC(env->allocator, sizeof(rp_trust10_t));
- if (trust10 == NULL)
+ if(trust10 == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -61,9 +60,9 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (trust10)
+ if(trust10)
{
- if (--(trust10->ref) > 0)
+ if(--(trust10->ref) > 0)
{
return;
}
@@ -92,8 +91,7 @@
axis2_bool_t must_support_client_challenge)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, must_support_client_challenge,
- AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, must_support_client_challenge, AXIS2_FAILURE);
trust10->must_support_client_challenge = must_support_client_challenge;
return AXIS2_SUCCESS;
@@ -117,8 +115,7 @@
axis2_bool_t must_support_server_challenge)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error, must_support_server_challenge,
- AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, must_support_server_challenge, AXIS2_FAILURE);
trust10->must_support_server_challenge = must_support_server_challenge;
return AXIS2_SUCCESS;
@@ -193,7 +190,6 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
rp_trust10_increment_ref(
rp_trust10_t * trust10,
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?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/ut.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/ut.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -34,13 +33,13 @@
const axutil_env_t * env)
{
rp_username_token_t *username_token = NULL;
- username_token = (rp_username_token_t *) AXIS2_MALLOC(
- env->allocator, sizeof (rp_username_token_t));
+ username_token = (rp_username_token_t *)AXIS2_MALLOC(env->allocator,
+ sizeof(rp_username_token_t));
- if (!username_token)
+ if(!username_token)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] User name token creation failed. Insufficient memory");
return NULL;
}
@@ -48,8 +47,7 @@
username_token->token = rp_token_create(env);
if(!username_token->token)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[neethi] User name token creation failed.");
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[neethi] User name token creation failed.");
rp_username_token_free(username_token, env);
return NULL;
}
@@ -70,7 +68,7 @@
{
if(username_token)
{
- if (--(username_token->ref) > 0)
+ if(--(username_token->ref) > 0)
{
return;
}
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?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss10.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss10.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -36,9 +35,9 @@
AXIS2_ENV_CHECK(env, NULL);
- wss10 = (rp_wss10_t *) AXIS2_MALLOC(env->allocator, sizeof(rp_wss10_t));
+ wss10 = (rp_wss10_t *)AXIS2_MALLOC(env->allocator, sizeof(rp_wss10_t));
- if (wss10 == NULL)
+ if(wss10 == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -61,9 +60,9 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (wss10)
+ if(wss10)
{
- if (--(wss10->ref) > 0)
+ if(--(wss10->ref) > 0)
{
return;
}
@@ -92,8 +91,7 @@
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;
@@ -117,8 +115,7 @@
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;
@@ -164,8 +161,7 @@
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;
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?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss11.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/wss11.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -39,9 +38,9 @@
AXIS2_ENV_CHECK(env, NULL);
- wss11 = (rp_wss11_t *) AXIS2_MALLOC(env->allocator, sizeof(rp_wss11_t));
+ wss11 = (rp_wss11_t *)AXIS2_MALLOC(env->allocator, sizeof(rp_wss11_t));
- if (wss11 == NULL)
+ if(wss11 == NULL)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -67,9 +66,9 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (wss11)
+ if(wss11)
{
- if (--(wss11->ref) > 0)
+ if(--(wss11->ref) > 0)
{
return;
}
@@ -97,8 +96,7 @@
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;
@@ -122,8 +120,7 @@
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;
@@ -171,8 +168,7 @@
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;
@@ -242,8 +238,7 @@
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;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/x509_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/x509_token.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/x509_token.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/x509_token.c Tue Aug 18 10:45:16 2009
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -35,11 +34,11 @@
const axutil_env_t * env)
{
rp_x509_token_t *x509_token = NULL;
- x509_token = (rp_x509_token_t *) AXIS2_MALLOC(env->allocator, sizeof(rp_x509_token_t));
+ x509_token = (rp_x509_token_t *)AXIS2_MALLOC(env->allocator, sizeof(rp_x509_token_t));
- if (!x509_token)
+ if(!x509_token)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[neethi] X509 token assertion creation failed. Insufficient memory");
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -66,9 +65,9 @@
rp_x509_token_t * x509_token,
const axutil_env_t * env)
{
- if (x509_token)
+ if(x509_token)
{
- if (--(x509_token->ref) > 0)
+ if(--(x509_token->ref) > 0)
{
return;
}
Modified: webservices/axis2/trunk/c/neethi/src/util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/util.c?rev=805352&r1=805351&r2=805352&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/util.c (original)
+++ webservices/axis2/trunk/c/neethi/src/util.c Tue Aug 18 10:45:16 2009
@@ -30,30 +30,29 @@
reader = axiom_xml_reader_create_for_file(env, file_name, NULL);
- if (!reader)
+ if(!reader)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CREATING_XML_STREAM_READER,
- AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CREATING_XML_STREAM_READER, AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
builder = axiom_stax_builder_create(env, reader);
- if (!builder)
+ if(!builder)
{
axiom_xml_reader_free(reader, env);
return NULL;
}
document = axiom_stax_builder_get_document(builder, env);
- if (!document)
+ if(!document)
{
axiom_stax_builder_free(builder, env);
return NULL;
}
root_node = axiom_document_build_all(document, env);
- if (!root_node)
+ if(!root_node)
{
axiom_stax_builder_free(builder, env);
return NULL;
@@ -74,15 +73,14 @@
axiom_element_t *root_ele = NULL;
- if (axiom_node_get_node_type(root_node, env) == AXIOM_ELEMENT)
+ if(axiom_node_get_node_type(root_node, env) == AXIOM_ELEMENT)
{
- root_ele =
- (axiom_element_t *) axiom_node_get_data_element(root_node, env);
- if (root_ele)
+ root_ele = (axiom_element_t *)axiom_node_get_data_element(root_node, env);
+ if(root_ele)
{
neethi_policy_t *neethi_policy = NULL;
neethi_policy = neethi_engine_get_policy(env, root_node, root_ele);
- if (!neethi_policy)
+ if(!neethi_policy)
{
return NULL;
}