Revision 617 branches/big-buffers-test_smartlist/src/df1b2-separable/df1b2fn2.cpp

df1b2fn2.cpp (revision 617)
28 28
  
29 29
char AD_allocation_error_message[]="Error tryng to allocate memory for ";
30 30

  
31
int get_f1b2buffer_size(const char * s);
31
size_t get_f1b2buffer_size(const char * s);
32 32

  
33 33
#if defined(CHECK_COUNT)
34 34
  int df1b2_gradlist::ncount_check=-1;
......
613 613
 * Description not yet available.
614 614
 * \param
615 615
 */
616
df1b2_gradlist::df1b2_gradlist(unsigned int _bs,unsigned int _nbs,
617
  unsigned int _bs2,unsigned int _nbs2,
618
  unsigned int _bs3,unsigned int _nbs3,
616
df1b2_gradlist::df1b2_gradlist(const size_t _bs, const size_t _nbs,
617
  const size_t _bs2, const size_t _nbs2,
618
  const size_t _bs3, const size_t _nbs3,
619 619
  const adstring& _filename)  
620 620
{
621
  int bs=get_f1b2buffer_size("-l1");
621
  size_t bs = get_f1b2buffer_size("-l1");
622 622
  if (!bs) bs=_bs;
623 623
  list.allocate(bs,_filename);
624 624

  
625
  int nbs=get_f1b2buffer_size("-nl1");
625
  size_t nbs=get_f1b2buffer_size("-nl1");
626 626
  if (!nbs) nbs=_nbs;
627 627
  nlist.allocate(nbs,"n"+_filename);
628 628

  
629
  int bs2=get_f1b2buffer_size("-l2");
629
  size_t bs2=get_f1b2buffer_size("-l2");
630 630
  if (!bs2) bs2=_bs2;
631 631
  list2.allocate(bs2,_filename+"2");
632 632

  
633
  int nbs2=get_f1b2buffer_size("-nl2");
633
  size_t nbs2=get_f1b2buffer_size("-nl2");
634 634
  if (!nbs2) nbs2=_nbs2;
635 635
  nlist2.allocate(nbs2,"n"+_filename+"2");
636 636

  
637
  int bs3=get_f1b2buffer_size("-l3");
637
  size_t bs3=get_f1b2buffer_size("-l3");
638 638
  if (!bs3) bs3=_bs3;
639 639
  list3.allocate(bs3,_filename+"3");
640 640

  
641
  int nbs3=get_f1b2buffer_size("-nl3");
641
  size_t nbs3=get_f1b2buffer_size("-nl3");
642 642
  if (!nbs3) nbs3=_nbs3;
643 643
  nlist3.allocate(nbs3,"n"+_filename+"3");
644 644

  
......
974 974
 * Description not yet available.
975 975
 * \param
976 976
 */
977
int get_f1b2buffer_size(const char * s)
977
size_t get_f1b2buffer_size(const char * s)
978 978
{
979
  int n=0;
979
  size_t n = 0;
980 980
  int on1=-1;
981 981
  int nopt=0;
982 982
  if ( (on1=option_match(ad_comm::argc,ad_comm::argv,s,nopt))>-1)
......
987 987
    }
988 988
    else
989 989
    {   
990
      n=atoi(ad_comm::argv[on1+1]);
990
      n=atoll(ad_comm::argv[on1+1]);
991 991
    }
992 992
  }
993 993
  return n;

Also available in: Unified diff