Changeset 1194 in Sophya for trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

Timestamp:

Sep 19, 2000, 5:09:28 PM (25 years ago)

Author:

ansari

Message:

changement de char* en string

File:

• trunk/SophyaExt/FitsIOServer/fitsxntuple.cc (modified) (2 diffs)

trunk/SophyaExt/FitsIOServer/fitsxntuple.cc

@@ -201 +201 @@
   DVList dvl= dobj_->Info();
   // extension name
-  char* extname = "XNTuple_Binary_tbl"; 
-  char** Noms = new char*[ncols];   
+  string extname("XNTuple_Binary_tbl"); 
+  vector<string> Noms(ncols);   
   int k;
   for (k=0; k< ncols; k++)
     {
-      Noms[k]= new char[LONNOM+1];
-      strncpy(Noms[k],dobj_->NomIndex(k).c_str(),LONNOM);
-      Noms[LONNOM] = '\0';
-    }
-   char* types=new char[ncols+1];
-  int compt=0;
+      Noms[k] = dobj_->NomIndex(k) ;
+    }
+  string types;
   for (k=0; k<dobj_->NDVar();k++)
     {
-      types[compt++]='D'; 
+      types+='D';
     }
   for (k=0; k<dobj_->NFVar();k++)
     {
-      types[compt++]='E'; 
+      types+='E';
     }
   for (k=0; k<dobj_->NIVar();k++)
     {
-      types[compt++]='I'; 
+      types+='I';
     }
   for (k=0; k<dobj_->NSVar();k++)
     {
-      types[compt++]='A'; 
+      types+='A';
     }            
-  types[ncols]='\0';
   vector<int> StringSizes(dobj_->NSVar());
   for (k=0; k< StringSizes.size(); k++) StringSizes[k]=dobj_->mStrSz;
   os.makeHeaderBntblOnFits(types, Noms, nrows, ncols, dvl, extname,StringSizes); 
-   for (k=0; k< ncols; k++)
-    {
-      delete [] Noms[k];
-    }
-   delete [] Noms;
-   delete [] types;
-
    
-  compt=0;  
+  int compt=0; 
    if (dobj_->NDVar() > 0) 
      {
@@ -296 +285 @@
               ccolumn[j] = NULL;
             }
+
         }
       delete [] ccolumn;