Changeset c510a7 for pcp/src/output.c


Ignore:
Timestamp:
Apr 29, 2008, 12:19:51 PM (18 years ago)
Author:
Frederik Heber <heber@…>
Children:
e936b3
Parents:
307fd1
Message:

char lengths of 255 and MAXDUMMYSTRING replaced with define MAXSTRINGSIZE in molecuilder and pcp

File:
1 edited

Legend:

Unmodified
Added
Removed

  • pcp/src/output.c

    r307fd1 rc510a7  
    329329 
    330330  SpeedMeasure(P,ReadnWriteTime,StartTimeDo);
    331   suffixdat = (char *) Malloc(sizeof(char)*255, "OutputSrcPsiDensity: *suffixdat");
    332   suffixdoc = (char *) Malloc(sizeof(char)*255, "OutputSrcPsiDensity: *suffixdoc");
     331  suffixdat = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "OutputSrcPsiDensity: *suffixdat");
     332  suffixdoc = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "OutputSrcPsiDensity: *suffixdoc");
    333333  sprintf(suffixdat, ".%.254s.L%i", P->R.MinimisationName[type], LevS->LevelNo);
    334   strncpy (suffixdoc, suffixdat, 255);
     334  strncpy (suffixdoc, suffixdat, MAXSTRINGSIZE);
    335335  // for the various spin cases, output the doc-file if it's process 0
    336336  if (P->Par.me_comm_ST == 0) { // if we are process 0 of SpinDouble or SpinUp&-Down
    … …  
    338338    case SpinDouble:
    339339      colorNo = 0;
    340       strncat (suffixdat, suffixsrcpsidat, 255-strlen(suffixdat));
    341       strncat (suffixdoc, suffixsrcpsidoc, 255-strlen(suffixdoc));
     340      strncat (suffixdat, suffixsrcpsidat, MAXSTRINGSIZE-strlen(suffixdat));
     341      strncat (suffixdoc, suffixsrcpsidoc, MAXSTRINGSIZE-strlen(suffixdoc));
    342342      Num =  Lat->Psi.GlobalNo[PsiMaxNoDouble];
    343343      break;
    344344    case SpinUp:
    345345      colorNo = 0;
    346       strncat (suffixdat, suffixsrcpsiupdat, 255-strlen(suffixdat));
    347       strncat (suffixdoc, suffixsrcpsiupdoc, 255-strlen(suffixdoc));
     346      strncat (suffixdat, suffixsrcpsiupdat, MAXSTRINGSIZE-strlen(suffixdat));
     347      strncat (suffixdoc, suffixsrcpsiupdoc, MAXSTRINGSIZE-strlen(suffixdoc));
    348348      Num = Lat->Psi.GlobalNo[PsiMaxNoUp];
    349349      break;
    350350    case SpinDown:
    351351      colorNo = 1;
    352       strncat (suffixdat, suffixsrcpsidowndat, 255-strlen(suffixdat));
    353       strncat (suffixdoc, suffixsrcpsidowndoc, 255-strlen(suffixdoc));
     352      strncat (suffixdat, suffixsrcpsidowndat, MAXSTRINGSIZE-strlen(suffixdat));
     353      strncat (suffixdoc, suffixsrcpsidowndoc, MAXSTRINGSIZE-strlen(suffixdoc));
    354354      Num =  Lat->Psi.GlobalNo[PsiMaxNoDown];
    355355      break;
    … …  
    571571  int LevelNo, readnr=0;
    572572  int zahl, signal = test ? 1 : 2; // 0 - ok, 1 - test failed, 2 - throw Error
    573   char suffixdat[255], suffixdoc[255];
     573  char suffixdat[MAXSTRINGSIZE], suffixdoc[MAXSTRINGSIZE];
    574574  int read_type, Num = 0, colorNo = 0;
    575575  char spin[20];
    … …  
    581581  SpeedMeasure(P,ReadnWriteTime,StartTimeDo);
    582582  sprintf(suffixdat, ".%.254s.L%i", P->R.MinimisationName[type], LevSNo);
    583   strncpy (suffixdoc, suffixdat, 255);
     583  strncpy (suffixdoc, suffixdat, MAXSTRINGSIZE);
    584584  // Depending on Psis::SpinType the source psi doc file is opened and header written
    585585  switch (Lat->Psi.PsiST) {
    586586  case SpinDouble:   
    587587    colorNo = 0;
    588     strncat (suffixdat, suffixsrcpsidat, 255-strlen(suffixdat));
    589     strncat (suffixdoc, suffixsrcpsidoc, 255-strlen(suffixdoc));
     588    strncat (suffixdat, suffixsrcpsidat, MAXSTRINGSIZE-strlen(suffixdat));
     589    strncat (suffixdoc, suffixsrcpsidoc, MAXSTRINGSIZE-strlen(suffixdoc));
    590590    strncpy (spin, "GlobalNoSpinDouble", 20);
    591591    Num = Lat->Psi.GlobalNo[PsiMaxNoDouble];
    … …  
    593593  case SpinUp:
    594594    colorNo = 0;
    595     strncat (suffixdat, suffixsrcpsiupdat, 255-strlen(suffixdat));
    596     strncat (suffixdoc, suffixsrcpsiupdoc, 255-strlen(suffixdoc));
     595    strncat (suffixdat, suffixsrcpsiupdat, MAXSTRINGSIZE-strlen(suffixdat));
     596    strncat (suffixdoc, suffixsrcpsiupdoc, MAXSTRINGSIZE-strlen(suffixdoc));
    597597    strncpy (spin, "GlobalNoSpinUp", 20);
    598598    Num = Lat->Psi.GlobalNo[PsiMaxNoUp];
    … …  
    600600  case SpinDown:
    601601    colorNo = 1;
    602     strncat (suffixdat, suffixsrcpsidowndat, 255-strlen(suffixdat));
    603     strncat (suffixdoc, suffixsrcpsidowndoc, 255-strlen(suffixdoc));
     602    strncat (suffixdat, suffixsrcpsidowndat, MAXSTRINGSIZE-strlen(suffixdat));
     603    strncat (suffixdoc, suffixsrcpsidowndoc, MAXSTRINGSIZE-strlen(suffixdoc));
    604604    strncpy (spin, "GlobalNoSpinDown", 20);
    605605    Num = Lat->Psi.GlobalNo[PsiMaxNoDown];
    … …  
    10511051
    10521052  // Open respective file depending on RiemannTensor use
    1053   suffix = (char *) Malloc(sizeof(char)*255, "CombineOutVisDensity: *suffix");
     1053  suffix = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "CombineOutVisDensity: *suffix");
    10541054  switch (Lat->RT.ActualUse) {
    10551055  case active:
    … …  
    13171317  int is,ia,i;
    13181318  FILE *SrcIonDoc, *SrcIonData;
    1319   char *suffix = (char *) Malloc(sizeof(char)*255, "CombineOutVisDensity: *suffix");
     1319  char *suffix = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "CombineOutVisDensity: *suffix");
    13201320
    13211321  if (!(P->Par.me == 0)) return;
    … …  
    14931493
    14941494  // generate file names
    1495   suffix = (char *) Malloc(sizeof(char)*255, "OutVisIons: * suffix");
     1495  suffix = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "OutVisIons: * suffix");
    14961496  datnamef = (char*)
    14971497    malloc(strlen(P->Files.mainname)+strlen(suffixionfor) + 1);
    … …  
    17761776  time(&seconds); // get current time
    17771777
    1778   filename = (char *) Malloc(sizeof(char)*255, "PlotSrcPlane: *filename");
     1778  filename = (char *) Malloc(sizeof(char)*MAXSTRINGSIZE, "PlotSrcPlane: *filename");
    17791779  switch (Lat->Psi.PsiST) {
    17801780    case SpinDouble:   
Note: See TracChangeset for help on using the changeset viewer.