You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by sa...@apache.org on 2006/07/12 06:03:41 UTC

svn commit: r421110 - in /webservices/sandesha/trunk/c/src/wsrm: accept.c ack_requested.c acks_to.c close_seq.c close_seq_res.c create_seq.c create_seq_res.c seq_ack.c seq_fault.c seq_offer.c sequence.c terminate_seq.c terminate_seq_res.c

Author: sahan
Date: Tue Jul 11 21:03:40 2006
New Revision: 421110

URL: http://svn.apache.org/viewvc?rev=421110&view=rev
Log:
Removed unwanted castings

Modified:
    webservices/sandesha/trunk/c/src/wsrm/accept.c
    webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
    webservices/sandesha/trunk/c/src/wsrm/acks_to.c
    webservices/sandesha/trunk/c/src/wsrm/close_seq.c
    webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c
    webservices/sandesha/trunk/c/src/wsrm/create_seq.c
    webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
    webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
    webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
    webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
    webservices/sandesha/trunk/c/src/wsrm/sequence.c
    webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
    webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c

Modified: webservices/sandesha/trunk/c/src/wsrm/accept.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/accept.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/accept.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/accept.c Tue Jul 11 21:03:40 2006
@@ -215,9 +215,8 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)accept_impl->acks_to),
-                        env, child_om_node))
+    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(accept_impl->acks_to, env, 
+                        child_om_node))
     {
         return NULL;
     }
@@ -256,8 +255,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)accept_impl->acks_to),
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(accept_impl->acks_to,
                         env, accept_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, accept_node);
 

Modified: webservices/sandesha/trunk/c/src/wsrm/ack_requested.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/ack_requested.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/ack_requested.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/ack_requested.c Tue Jul 11 21:03:40 2006
@@ -273,8 +273,7 @@
         return NULL;
     }
     if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)
-                        ack_requested_impl->identifier), env, requested_node))
+                        ack_requested_impl->identifier, env, requested_node))
     {
         return NULL;
     }
@@ -295,8 +294,7 @@
             return NULL;
         }
         if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)
-                        ack_requested_impl->msg_num), env, requested_node))
+                        ack_requested_impl->msg_num, env, requested_node))
         {
             return NULL;
         }
@@ -337,12 +335,12 @@
     AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(ar_header_blk, env,
                         ack_requested_impl->must_understand);
     ar_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(ar_header_blk, env);
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        ack_requested_impl->identifier), env, ar_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(ack_requested_impl->identifier, env, 
+                        ar_node);
     if(NULL != ack_requested_impl->msg_num)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        ack_requested_impl->msg_num), env, ar_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(ack_requested_impl->msg_num, env, 
+                        ar_node);
     }
     return ar_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/acks_to.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/acks_to.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/acks_to.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/acks_to.c Tue Jul 11 21:03:40 2006
@@ -212,8 +212,7 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)(acks_to_impl->address)), env,
+    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(acks_to_impl->address, env,
                         acks_to_node))
     {
         return NULL;
@@ -253,9 +252,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)(acks_to_impl->address)), env,
-                        at_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(acks_to_impl->address, env, at_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, at_node);
     return (axiom_node_t*)om_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/close_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/close_seq.c Tue Jul 11 21:03:40 2006
@@ -237,9 +237,8 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)
-                        close_seq_impl->identifier), env, close_seq_node))
+    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(close_seq_impl->identifier,
+                        env, close_seq_node))
     {
         return NULL;   
     }
@@ -279,9 +278,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)
-                        close_seq_impl->identifier), env, cs_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(close_seq_impl->identifier, env, cs_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, cs_node);
     return (axiom_node_t*)om_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/close_seq_res.c Tue Jul 11 21:03:40 2006
@@ -245,8 +245,7 @@
         return NULL;
     }
     if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t *)
-                        close_seq_res_impl->identifier), env, csr_node))
+                        close_seq_res_impl->identifier, env, csr_node))
     {
         return NULL;
     }
@@ -286,9 +285,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(
-                        ((sandesha2_iom_rm_element_t *)
-                        close_seq_res_impl->identifier), env, csr_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(close_seq_res_impl->identifier, env, csr_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, csr_node);
     return (axiom_node_t*)om_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq.c Tue Jul 11 21:03:40 2006
@@ -275,9 +275,8 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)
-                        create_seq_impl->acks_to), env, seq_node))
+    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(create_seq_impl->acks_to, 
+                        env, seq_node))
     {
         return NULL;
     }
@@ -298,8 +297,7 @@
             return NULL;
         }
         if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)
-                        create_seq_impl->seq_offer), env, seq_node))
+                        create_seq_impl->seq_offer, env, seq_node))
         {
             return NULL;
         } 
@@ -321,7 +319,7 @@
             return NULL;
         }
         if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)create_seq_impl->expires),
+                        create_seq_impl->expires,
                         env, seq_node))
         {
             return NULL;
@@ -362,17 +360,16 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        create_seq_impl->acks_to), env, cs_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_impl->acks_to, env, cs_node);
     if(NULL != create_seq_impl->expires)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        create_seq_impl->expires), env, cs_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_impl->expires, env, 
+                        cs_node);
     }
     if(NULL != create_seq_impl->seq_offer)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        create_seq_impl->seq_offer), env, cs_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_impl->seq_offer, env, 
+                        cs_node);
     }
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, cs_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/create_seq_res.c Tue Jul 11 21:03:40 2006
@@ -291,8 +291,7 @@
         return NULL;
     }
     if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t *)
-                        create_seq_res_impl->identifier), env, csr_node))
+                        create_seq_res_impl->identifier, env, csr_node))
     {
         return NULL;
     }
@@ -313,8 +312,7 @@
             return NULL;
         }
         if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)
-                        create_seq_res_impl->expires), env, csr_node))
+                        create_seq_res_impl->expires, env, csr_node))
         {
             return NULL;
         }
@@ -337,8 +335,7 @@
             return NULL;
         }
         if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)
-                        create_seq_res_impl->accept), env, csr_node))
+                        create_seq_res_impl->accept, env, csr_node))
         {
             return NULL;
         }
@@ -379,17 +376,17 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        create_seq_res_impl->identifier), env, csr_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_res_impl->identifier, env,
+                        csr_node);
     if(NULL != create_seq_res_impl->accept)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        create_seq_res_impl->accept), env, csr_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_res_impl->accept, env, 
+                        csr_node);
     }
     if(NULL != create_seq_res_impl->expires)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        create_seq_res_impl->expires), env, csr_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(create_seq_res_impl->expires, env, 
+                        csr_node);
     }
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, csr_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_ack.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_ack.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_ack.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_ack.c Tue Jul 11 21:03:40 2006
@@ -306,8 +306,7 @@
     {
         return NULL;
     }
-    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(
-                        ((sandesha2_iom_rm_element_t*)seq_ack_impl->identifier), 
+    if(NULL == SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_ack_impl->identifier, 
                         env, sa_node))
     {
         return NULL;
@@ -337,8 +336,7 @@
             {
                 return NULL;
             } 
-            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE((sandesha2_iom_rm_element_t*)
-                        ack_range, env, ack_node);
+            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(ack_range, env, ack_node);
             AXIS2_ARRAY_LIST_ADD(seq_ack_impl->ack_range_list, env, ack_range);
         }
     }
@@ -367,8 +365,7 @@
             {
                 return NULL;
             }
-            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE((sandesha2_iom_rm_element_t*)
-                        nack, env, nack_node);
+            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(nack, env, nack_node);
             AXIS2_ARRAY_LIST_ADD(seq_ack_impl->nack_list, env, nack);
         }
     }
@@ -397,8 +394,7 @@
             {
                 return NULL;
             }
-            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_ack_impl->ack_final), env,
+            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_ack_impl->ack_final, env,
                         sa_node);
         }
     }
@@ -425,8 +421,8 @@
             {
                 return NULL;
             }
-            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_ack_impl->ack_none), env, sa_node);
+            SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_ack_impl->ack_none, env, 
+                        sa_node);
         }
     }
     return seq_ack;
@@ -476,16 +472,14 @@
         sandesha2_ack_range_t *ack_range = NULL;
         ack_range = (sandesha2_ack_range_t*)AXIS2_ARRAY_LIST_GET(
                         seq_ack_impl->ack_range_list, env, i);
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE((sandesha2_iom_rm_element_t*)
-                        ack_range, env, sa_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(ack_range, env, sa_node);
     }
     for(i = 0; i < AXIS2_ARRY_LIST_SIZE(seq_ack_impl->nack_list, env); i++)
     {
         sandesha2_nack_t *nack = NULL;
         nack = (sandesha2_nack_t*)AXIS2_ARRAY_LIST_GET(
                         seq_ack_impl->nack_list, env, i);
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE((sandesha2_iom_rm_element_t*)nack, 
-                        env, sa_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(nack, env, sa_node);
     }
     rm_spec_ver = sandesha2_spec_specific_consts_get_spec_ver_str(env,
                         seq_ack_impl->ns_val);
@@ -516,8 +510,8 @@
         }
         else
         {
-            SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_ack_impl->ack_none), env, sa_node);   
+            SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_ack_impl->ack_none, env, 
+                        sa_node);   
         }                            
     }
     if(NULL != seq_ack_impl->ack_final)
@@ -532,8 +526,8 @@
         }
         else
         {
-            SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_ack_impl->ack_final), env, sa_node);  
+            SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_ack_impl->ack_final, env, 
+                        sa_node);  
         }
     }
     /**

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_fault.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_fault.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_fault.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_fault.c Tue Jul 11 21:03:40 2006
@@ -225,8 +225,8 @@
         {
             return NULL;
         }
-        AXIS2_IOM_RM_ELEMENT_FROM_OM_NODE((sandesha2_iom_rm_element_t*)
-                        seq_fault_impl->fault_code, env, sf_node);
+        AXIS2_IOM_RM_ELEMENT_FROM_OM_NODE(seq_fault_impl->fault_code, env, 
+                        sf_node);
     }    
     return seq_fault;    
 }
@@ -259,8 +259,8 @@
     }
     if(NULL != seq_fault_impl->fault_code)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE((sandesha2_iom_rm_element_t*)
-                        seq_fault_impl->fault_code, env, sf_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_fault_impl->fault_code, env, 
+                        sf_node);
     }
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, sf_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/seq_offer.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/seq_offer.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/seq_offer.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/seq_offer.c Tue Jul 11 21:03:40 2006
@@ -231,8 +231,7 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_NODE_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_offer_impl->identifier), env, so_node);
+    SANDESHA2_IOM_RM_NODE_FROM_OM_NODE(seq_offer_impl->identifier, env, so_node);
     exp_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_EXPIRES,
                         seq_offer_impl->ns_val, NULL);
     if(NULL == exp_qname)
@@ -249,8 +248,8 @@
         {
             return NULL;
         }
-        SANDESHA2_IOM_RM_NODE_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_offer_impl->expires), env, exp_node);
+        SANDESHA2_IOM_RM_NODE_FROM_OM_NODE(seq_offer_impl->expires, env, 
+                        exp_node);
     }
     return seq_offer;
 }
@@ -287,12 +286,11 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_offer_impl->identifier), env, so_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_offer_impl->identifier, env, so_node);
     if(NULL != seq_offer_impl->expires)
     {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_offer_impl->expires), env, so_node);
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(seq_offer_impl->expires, env, 
+                        so_node);
     }
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, so_node);
     return (axiom_node_t*)om_node;

Modified: webservices/sandesha/trunk/c/src/wsrm/sequence.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/sequence.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/sequence.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/sequence.c Tue Jul 11 21:03:40 2006
@@ -269,16 +269,15 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_impl->identifier), env, seq_node);
-    seq_impl->msg_num= sandesha2_msg_number_create(env, 
-                        seq_impl->ns_val);
-    if(NULL == seq_impl->msg_num)
+    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(sequence_impl->identifier, env, 
+                        seq_node);
+    sequence_impl->msg_num= sandesha2_msg_number_create(env, 
+                        sequence_impl->ns_val);
+    if(NULL == sequence_impl->msg_num)
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_impl->msg_num), env, seq_node);
+    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(sequence_impl->msg_num, env, seq_node);
     lm_qname = axis2_qname_create(env, SANDESHA2_WSRM_COMMON_LAST_MSG,
                         seq_impl->ns_val, NULL);
     if(NULL == lm_qname)
@@ -295,8 +294,8 @@
         {
             return NULL;
         }
-        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_impl->last_msg), env, lm_node);
+        SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(sequence_impl->last_msg, env, 
+                        lm_node);
     }
     return seq;
 }
@@ -338,14 +337,11 @@
     AXIOM_SOAP_HEADER_BLOCK_SET_MUST_UNDERSTAND_WITH_BOOL(seq_block, env, 
                         seq_impl->must_understand);
     seq_node = AXIOM_SOAP_HEADER_BLOCK_GET_BASE_NODE(seq_block, env);
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_impl->identifier), env, seq_node);
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_impl->msg_num), env, seq_node);
-    if(NULL != seq_impl->last_msg)
-    {
-        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        seq_impl->last_msg), env, seq_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(sequence_impl->identifier, env, seq_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(sequence_impl->msg_num, env, seq_node);
+    if(NULL != sequence_impl->last_msg)
+        SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(sequence_impl->last_msg, env, 
+                        seq_node);
     }
     return seq_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq.c Tue Jul 11 21:03:40 2006
@@ -240,8 +240,8 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        terminate_seq_impl->identifier), env, ts_node);
+    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(terminate_seq_impl->identifier, env,
+                        ts_node);
     return terminate_seq;
 }
 
@@ -278,8 +278,8 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        terminate_seq_impl->identifier), env, ts_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(terminate_seq_impl->identifier, env, 
+                        ts_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, ts_node);
     return (axiom_node_t*)om_node;
 }

Modified: webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c?rev=421110&r1=421109&r2=421110&view=diff
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c (original)
+++ webservices/sandesha/trunk/c/src/wsrm/terminate_seq_res.c Tue Jul 11 21:03:40 2006
@@ -257,8 +257,8 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        terminate_seq_res_impl->identifier), env, tsr_node);
+    SANDESHA2_IOM_RM_ELEMENT_FROM_OM_NODE(terminate_seq_res_impl->identifier, 
+                        env, tsr_node);
     return terminate_seq_res;
 }
 
@@ -296,8 +296,8 @@
     {
         return NULL;
     }
-    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(((sandesha2_iom_rm_element_t*)
-                        terminate_seq_res_impl->identifier), env, tsr_node);
+    SANDESHA2_IOM_RM_ELEMENT_TO_OM_NODE(terminate_seq_res_impl->identifier, 
+                        env, tsr_node);
     AXIOM_NODE_ADD_CHILD((axiom_node_t*)om_node, env, tsr_node);
     return (axiom_node_t*)om_node;
 }



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