Changeset e53182 in git


Ignore:
Timestamp:
Oct 13, 2008, 7:32:35 PM (16 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
11c057ed37568cd571af3b8f994f8bbe6c96a439
Parents:
47fa19583c6aac5d7fbb8a1d45f75499e841eafd
Message:
*hannes: StringAppend


git-svn-id: file:///usr/local/Singular/svn/trunk@11134 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • kernel/febase.cc

    r47fa195 re53182  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: febase.cc,v 1.20 2008-10-13 17:17:06 Singular Exp $ */
     4/* $Id: febase.cc,v 1.21 2008-10-13 17:32:34 Singular Exp $ */
    55/*
    66* ABSTRACT: i/o system
    … …  
    826826    if ((more=feBufferStart-feBuffer+strlen(fmt)+100)>feBufferLength)
    827827    {
    828       more = ((more + (4*1024-1))/(4*1024))*(4*1024);
     828      more = ((more + (8*1024-1))/(8*1024))*(8*1024);
    829829      int l=s-feBuffer;
    830       if (more!=feBufferLength)
     830      //if (more!=feBufferLength)
    831831      {
    832832        feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
    … …  
    868868char * StringAppendS(const char *st)
    869869{
    870   /* feBufferStart is feBuffer + strlen(feBuffer);*/
    871   int l;
    872   long more;
    873   int ll=feBufferStart-feBuffer;
    874   if ((more=ll+2+(l=strlen(st)))>feBufferLength)
    875   {
    876     more = ((more + (4*1024-1))/(4*1024))*(4*1024);
    877     feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
    878                                                      more);
    879     feBufferLength=more;
    880     feBufferStart=feBuffer+ll;
    881   }
    882   strcat(feBufferStart, st);
    883   feBufferStart +=l;
     870  if (*st!='\0')
     871  {
     872    /* feBufferStart is feBuffer + strlen(feBuffer);*/
     873    int l;
     874    long more;
     875    int ll=feBufferStart-feBuffer;
     876    if ((more=ll+2+(l=strlen(st)))>feBufferLength)
     877    {
     878      more = ((more + (8*1024-1))/(8*1024))*(8*1024);
     879      feBuffer=(char *)omReallocSize((ADDRESS)feBuffer,feBufferLength,
     880                                                       more);
     881      feBufferLength=more;
     882      feBufferStart=feBuffer+ll;
     883    }
     884    strcat(feBufferStart, st);
     885    feBufferStart +=l;
     886  }
    884887  return feBuffer;
    885888}

  • kernel/gnumpc.cc

    r47fa195 re53182  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: gnumpc.cc,v 1.7 2008-03-19 17:44:08 Singular Exp $ */
     4/* $Id: gnumpc.cc,v 1.8 2008-10-13 17:32:34 Singular Exp $ */
    55/*
    66* ABSTRACT: computations with GMP complex floating-point numbers
    … …  
    461461{
    462462  if (a==NULL)
    463     StringAppend("0");
     463    StringAppendS("0");
    464464  else
    465465  {
    466466    char *out;
    467467    out= complexToStr(*(gmp_complex*)a,gmp_output_digits);
    468     StringAppend(out);
     468    StringAppendS(out);
    469469    //    omFreeSize((ADDRESS)out, (strlen(out)+1)* sizeof(char) );
    470470    omFree( (ADDRESS)out );

  • kernel/gnumpfl.cc

    r47fa195 re53182  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: gnumpfl.cc,v 1.9 2008-05-20 14:40:00 Singular Exp $ */
     4/* $Id: gnumpfl.cc,v 1.10 2008-10-13 17:32:35 Singular Exp $ */
    55/*
    66* ABSTRACT: computations with GMP floating-point numbers
    … …  
    479479  {
    480480    out= floatToStr(*(gmp_float*)a,gmp_output_digits);
    481     StringAppend(out);
     481    StringAppendS(out);
    482482    //omFreeSize((ADDRESS)out, (strlen(out)+1)* sizeof(char) );
    483483    omFree( (ADDRESS)out );
    … …  
    485485  else
    486486  {
    487     StringAppend("0");
     487    StringAppendS("0");
    488488  }
    489489}

  • kernel/ring.cc

    r47fa195 re53182  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ring.cc,v 1.103 2008-08-22 11:56:55 Singular Exp $ */
     4/* $Id: ring.cc,v 1.104 2008-10-13 17:32:35 Singular Exp $ */
    55
    66/*
    … …  
    545545  for (l=0; ; l++)
    546546  {
    547     StringAppend((char *)rSimpleOrdStr(r->order[l]));
     547    StringAppendS((char *)rSimpleOrdStr(r->order[l]));
    548548    if ((r->order[l] != ringorder_c) && (r->order[l] != ringorder_C))
    549549    {
Note: See TracChangeset for help on using the changeset viewer.