Changeset 3be94e8 in sasview for sansmodels


Ignore:
Timestamp:
Nov 30, 2011 5:11:14 PM (13 years ago)
Author:
Mathieu Doucet <doucetm@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
b23b722
Parents:
1a31715
Message:

Re #5 fixing problem with malloc

Location:
sansmodels/src/sans/models/c_extensions
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • sansmodels/src/sans/models/c_extensions/onion.c

    rc25f1fa r3be94e8  
    2828  int *fun_type; 
    2929 
    30   sld_out = (double*) malloc(n+2); 
    31   slope = (double*) malloc(n+2); 
    32   sld_in = (double*) malloc(n+2); 
    33   thick = (double*) malloc(n+2); 
    34   A = (double*) malloc(n+2); 
    35   fun_type = (int*) malloc(n+2); 
     30  sld_out = (double*)malloc((n+2)*sizeof(double)); 
     31  slope = (double*)malloc((n+2)*sizeof(double)); 
     32  sld_in = (double*)malloc((n+2)*sizeof(double)); 
     33  thick = (double*)malloc((n+2)*sizeof(double)); 
     34  A = (double*)malloc((n+2)*sizeof(double)); 
     35  fun_type = (int*)malloc((n+2)*sizeof(int)); 
    3636 
    3737        for (i =1; i<=n; i++){ 

  • sansmodels/src/sans/models/c_extensions/refl.c

    r72da06f r3be94e8  
    3636  complex  inv_n,phi1,alpha,alpha2,kn,fnm,fnp,rn,Xn,nn,nn2,an,nnp1,one,zero,two,n_sub,n_sup,knp1,Xnp1; 
    3737 
    38   sld = (double*)malloc(n+2); 
    39   thick_inter = (double*)malloc(n+2); 
    40   thick = (double*)malloc(n+2); 
    41   fun_type = (int*)malloc(n+2); 
     38  sld = (double*)malloc((n+2)*sizeof(double)); 
     39  thick_inter = (double*)malloc((n+2)*sizeof(double)); 
     40  thick = (double*)malloc((n+2)*sizeof(double)); 
     41  fun_type = (int*)malloc((n+2)*sizeof(int)); 
    4242 
    4343  fun_type[0] = dp[3]; 

  • sansmodels/src/sans/models/c_extensions/refl_adv.c

    r01a870d r3be94e8  
    4040  complex  inv_n,phi1,alpha,alpha2,kn,fnm,fnp,rn,Xn,nn,nn2,an,nnp1,one,zero,two,n_sub,n_sup,knp1,Xnp1; 
    4141 
    42   fun_type = (int*)malloc(n+2); 
    43   sld = (double*)malloc(n+2); 
    44   sld_im = (double*)malloc(n+2); 
    45   thick_inter = (double*)malloc(n+2); 
    46   thick = (double*)malloc(n+2); 
    47   fun_coef = (double*)malloc(n+2); 
     42  fun_type = (int*)malloc((n+2)*sizeof(int)); 
     43  sld = (double*)malloc((n+2)*sizeof(double)); 
     44  sld_im = (double*)malloc((n+2)*sizeof(double)); 
     45  thick_inter = (double*)malloc((n+2)*sizeof(double)); 
     46  thick = (double*)malloc((n+2)*sizeof(double)); 
     47  fun_coef = (double*)malloc((n+2)*sizeof(double)); 
    4848 
    4949  fun_type[0] = dp[3]; 

  • sansmodels/src/sans/models/c_extensions/spheresld.c

    r535136f r3be94e8  
    3838        double total_thick; 
    3939 
    40         fun_type = (int*)malloc(n+2); 
    41   sld = (double*)malloc(n+2); 
    42   thick_inter = (double*)malloc(n+2); 
    43   thick = (double*)malloc(n+2); 
    44   fun_coef = (double*)malloc(n+2); 
     40        fun_type = (int*)malloc((n+2)*sizeof(int)); 
     41  sld = (double*)malloc((n+2)*sizeof(double)); 
     42  thick_inter = (double*)malloc((n+2)*sizeof(double)); 
     43  thick = (double*)malloc((n+2)*sizeof(double)); 
     44  fun_coef = (double*)malloc((n+2)*sizeof(double)); 
    4545 
    4646        fun_type[0] = dp[3]; 
Note: See TracChangeset for help on using the changeset viewer.