You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2007/08/17 07:35:19 UTC

svn commit: r566923 - in /webservices/axis2/trunk/c/neethi: include/rp_element.h include/rp_header.h src/secpolicy/builder/signed_encrypted_parts_builder.c src/secpolicy/model/element.c src/secpolicy/model/header.c

Author: manjula
Date: Thu Aug 16 22:35:16 2007
New Revision: 566923

URL: http://svn.apache.org/viewvc?view=rev&rev=566923
Log:
Fixing AXIS2C-673.

Modified:
    webservices/axis2/trunk/c/neethi/include/rp_element.h
    webservices/axis2/trunk/c/neethi/include/rp_header.h
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/element.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/model/header.c

Modified: webservices/axis2/trunk/c/neethi/include/rp_element.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/include/rp_element.h?view=diff&rev=566923&r1=566922&r2=566923
==============================================================================
--- webservices/axis2/trunk/c/neethi/include/rp_element.h (original)
+++ webservices/axis2/trunk/c/neethi/include/rp_element.h Thu Aug 16 22:35:16 2007
@@ -54,7 +54,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     rp_element_set_namespace(rp_element_t *element,
                             const axutil_env_t *env,
-                            axis2_char_t *namespace);
+                            axis2_char_t *nspace);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/neethi/include/rp_header.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/include/rp_header.h?view=diff&rev=566923&r1=566922&r2=566923
==============================================================================
--- webservices/axis2/trunk/c/neethi/include/rp_header.h (original)
+++ webservices/axis2/trunk/c/neethi/include/rp_header.h Thu Aug 16 22:35:16 2007
@@ -54,7 +54,7 @@
     AXIS2_EXTERN axis2_status_t AXIS2_CALL
     rp_header_set_namespace(rp_header_t *header,
                             const axutil_env_t *env,
-                            axis2_char_t *namespace);
+                            axis2_char_t *nspace);
 
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c?view=diff&rev=566923&r1=566922&r2=566923
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c Thu Aug 16 22:35:16 2007
@@ -171,7 +171,7 @@
 {
     rp_header_t *header = NULL;
     axis2_char_t *name = NULL;
-    axis2_char_t *namespace = NULL;    
+    axis2_char_t *nspace = NULL;    
 
     AXIS2_ENV_CHECK(env,NULL);
 
@@ -180,9 +180,9 @@
         return NULL;
 
     name = axiom_element_get_attribute_value_by_name(element, env, RP_NAME);
-    namespace = axiom_element_get_attribute_value_by_name(
+    nspace = axiom_element_get_attribute_value_by_name(
             element, env, RP_NAMESPACE);
-    if(!namespace)
+    if(!nspace)
     {
         rp_header_free(header, env);
         header = NULL;
@@ -193,7 +193,7 @@
         rp_header_set_name(header, env, name); 
     }
 
-    rp_header_set_namespace(header, env, namespace);    
+    rp_header_set_namespace(header, env, nspace);    
     
     return header;
 }

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=566923&r1=566922&r2=566923
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/element.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/element.c Thu Aug 16 22:35:16 2007
@@ -21,7 +21,7 @@
 struct rp_element_t
 {
     axis2_char_t *name;
-    axis2_char_t *namespace;
+    axis2_char_t *nspace;
 };
 
 AXIS2_EXTERN rp_element_t *AXIS2_CALL 
@@ -40,7 +40,7 @@
         return NULL;
     }
     element->name = NULL;
-    element->namespace = NULL;
+    element->nspace = NULL;
     
     return element;
 
@@ -95,7 +95,7 @@
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    return element->namespace;
+    return element->nspace;
     
 }
 
@@ -103,12 +103,12 @@
 rp_element_set_namespace(
     rp_element_t *element,
     const axutil_env_t *env,
-    axis2_char_t *namespace)
+    axis2_char_t *nspace)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, namespace, AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, nspace, AXIS2_FAILURE);   
 
-    element->namespace = namespace;
+    element->nspace = nspace;
 
     return AXIS2_SUCCESS;
 

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=566923&r1=566922&r2=566923
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/header.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/header.c Thu Aug 16 22:35:16 2007
@@ -21,7 +21,7 @@
 struct rp_header_t
 {
     axis2_char_t *name;
-    axis2_char_t *namespace;
+    axis2_char_t *nspace;
 };
 
 AXIS2_EXTERN rp_header_t *AXIS2_CALL 
@@ -40,7 +40,7 @@
         return NULL;
     }
     header->name = NULL;
-    header->namespace = NULL;
+    header->nspace = NULL;
     
     return header;
 
@@ -60,10 +60,10 @@
             AXIS2_FREE(env->allocator, header->name);
             header->name = NULL;
         }
-        if(header->namespace)
+        if(header->nspace)
         {
-            AXIS2_FREE(env->allocator, header->namespace);
-            header->namespace = NULL;
+            AXIS2_FREE(env->allocator, header->nspace);
+            header->nspace = NULL;
         }
 
         AXIS2_FREE(env->allocator, header);
@@ -106,19 +106,19 @@
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     
-    return header->namespace;
+    return header->nspace;
     
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL 
 rp_header_set_namespace(rp_header_t *header,
     const axutil_env_t *env,
-    axis2_char_t *namespace)
+    axis2_char_t *nspace)
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    AXIS2_PARAM_CHECK(env->error, namespace, AXIS2_FAILURE);   
+    AXIS2_PARAM_CHECK(env->error, nspace, AXIS2_FAILURE);   
 
-    header->namespace = axutil_strdup(env, namespace);
+    header->nspace = axutil_strdup(env, nspace);
 
     return AXIS2_SUCCESS;
 



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