fight against multiple 'extern' specification

[simgrid.git] / src / xbt / xbt_matrix.c

diff --git a/src/xbt/xbt_matrix.c b/src/xbt/xbt_matrix.c
index 0238b47..b644d3b 100644 (file)
--- a/src/xbt/xbt_matrix.c
+++ b/src/xbt/xbt_matrix.c
@@ -7,6 +7,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#include <stdio.h>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/matrix.h"
@@ -16,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_matrix,xbt,"2D data storage");
 /** \brief constructor */
 xbt_matrix_t xbt_matrix_new(int lines, int rows, 
                            const unsigned long elmsize,
-                           void_f_pvoid_t * const free_f)  {
+                           void_f_pvoid_t const free_f)  {
    xbt_matrix_t res=xbt_new(s_xbt_matrix_t, 1);
    res->lines   = lines;
    res->rows    = rows;
@@ -30,7 +31,7 @@ xbt_matrix_t xbt_matrix_new(int lines, int rows,
 xbt_matrix_t xbt_matrix_new_sub(xbt_matrix_t from, 
                                int lsize, int rsize,
                                int lpos, int rpos,
-                               pvoid_f_pvoid_t *const cpy_f) {
+                               pvoid_f_pvoid_t const cpy_f) {
    
    xbt_matrix_t res=xbt_matrix_new(lsize,rsize,
                                   from->elmsize, from->free_f);
@@ -72,7 +73,7 @@ void xbt_matrix_dump(xbt_matrix_t matrix, const char*name, int coords,
         fprintf(stderr," (%d,%d)=",i,j);
        else 
         fprintf(stderr," ");
-       display_fun(xbt_matrix_get_ptr(matrix,i,j));
+       (*display_fun)(xbt_matrix_get_ptr(matrix,i,j));
     }
     fprintf(stderr,"\n");
   }
@@ -96,7 +97,7 @@ void xbt_matrix_copy_values(xbt_matrix_t dst, xbt_matrix_t src,
                            int lsize, int rsize,
                            int lpos_dst,int rpos_dst,
                            int lpos_src,int rpos_src,
-                           pvoid_f_pvoid_t *const cpy_f) {
+                           pvoid_f_pvoid_t const cpy_f) {
    int i,j;
    
    DEBUG10("Copy a %dx%d submatrix from %dx%d(of %dx%d) to %dx%d (of %dx%d)",
@@ -118,7 +119,7 @@ void xbt_matrix_copy_values(xbt_matrix_t dst, xbt_matrix_t src,
    for (i=0;i<rsize;i++) {
       if (cpy_f) {
         for (j=0;j<lsize;j++)
-          xbt_matrix_get_as(dst,j+lpos_dst,i+rpos_dst,void*) = cpy_f(xbt_matrix_get_ptr(src,j+rpos_src,i+lpos_src));
+          xbt_matrix_get_as(dst,j+lpos_dst,i+rpos_dst,void*) = (*cpy_f)(xbt_matrix_get_ptr(src,j+rpos_src,i+lpos_src));
       } else {
         memcpy(xbt_matrix_get_ptr(dst,lpos_dst,i+rpos_dst),
                xbt_matrix_get_ptr(src,lpos_src,i+rpos_src),
@@ -132,7 +133,7 @@ void xbt_matrix_copy_values(xbt_matrix_t dst, xbt_matrix_t src,
 xbt_matrix_t xbt_matrix_double_new_zeros(int lines, int rows) {
   xbt_matrix_t res = xbt_matrix_new(lines, rows,sizeof(double),NULL);
    
-  memset(res->data,0,sizeof(res->data));
+  memset(res->data,0, res->elmsize * res->lines * res->rows);
   return res;
 }