svn commit: r557211 - in /webservices/rampart/trunk/c/src/omxmlsec/c14n: c14n_sorted_list.h sorted_list.c

[nandika]

Author: nandika
Date: Wed Jul 18 02:44:41 2007
New Revision: 557211

URL: http://svn.apache.org/viewvc?view=rev&rev=557211
Log:
bug fixed in c14n code

Modified:
    webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n_sorted_list.h
    webservices/rampart/trunk/c/src/omxmlsec/c14n/sorted_list.c

Modified: webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n_sorted_list.h
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n_sorted_list.h?view=diff&rev=557211&r1=557210&r2=557211
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n_sorted_list.h (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/c14n/c14n_sorted_list.h Wed Jul 18 
02:44:41 2007
@@ -60,17 +60,20 @@
 #endif
 
 #define C14N_SORTED_LIST_INSERT(list, val, ctx, compar, env)\
-    sorted_list_insert(list, val, ctx, compar)
+    sorted_list_insert((list), (val), (ctx), (compar), (env))
 
 #define c14n_sorted_list_create(env) NULL
 
-#define C14N_SORTED_LIST_FREE(list, fp_free, env) sorted_list_free(list, 
fp_free)
+#define C14N_SORTED_LIST_FREE(list, fp_free, env)\
+               sorted_list_free((list), (fp_free))
 
 #define C14N_SORTED_LIST_ITERATE(list, ctx, fp_perform, env)\
-    sorted_list_iterate(list, ctx, fp_perform, env)
+    sorted_list_iterate((list), (ctx), (fp_perform), (env))
 
 #define C14N_SORTED_LIST_FREE_CONTAINER(list, env)\
-    sorted_list_free_container(list, env);\
-    AXIS2_FREE(env->allocator, list)
+    if (list) {\
+       sorted_list_free_container((list), (env));\
+       AXIS2_FREE((env)->allocator, (list));\
+    }
 
 #endif

Modified: webservices/rampart/trunk/c/src/omxmlsec/c14n/sorted_list.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/c14n/sorted_list.c?view=diff&rev=557211&r1=557210&r2=557211
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/c14n/sorted_list.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/c14n/sorted_list.c Wed Jul 18 
02:44:41 2007
@@ -48,20 +48,21 @@
     c14n_sorted_list_t **node,
     void *val,
     const void *ctx,
-    int(*compar)(const void *, const void *, const void *)
+    int(*compar)(const void *, const void *, const void *),
+    const axutil_env_t *env
 )
 {
     if(!(*node)) {
-        *node = (c14n_sorted_list_t *) malloc(sizeof(**node));
+        *node = (c14n_sorted_list_t *) AXIS2_MALLOC(env->allocator, 
(sizeof(**node)));
         (*node)->left = (*node)->right = NULL;
         (*node)->val = val;
         return;
     }
 
     if(compar(val, (*node)->val, ctx)<0)
-        sorted_list_insert(&(*node)->left, val, ctx, compar);
+        sorted_list_insert(&(*node)->left, val, ctx, compar, env);
     else if(compar(val, (*node)->val, ctx)>0)
-        sorted_list_insert(&(*node)->right, val, ctx, compar);
+        sorted_list_insert(&(*node)->right, val, ctx, compar, env);
     else; /*neglect if the same ns*/
 }