Changeset 3572 in Sophya for trunk/FrEROS

Timestamp:

Feb 7, 2009, 10:50:34 PM (17 years ago)

Author:

cmv

Message:

char* -> const char* pour regler les problemes de deprecated string const... + comparaison unsigned signed + suppression EVOL_PLANCK rz+cmv 07/02/2009

Location:

trunk/FrEROS/AnaLC

Files:

• anafsv.cc (modified) (1 diff)
• courbe_nb.cc (modified) (1 diff)
• courbe_nb.h (modified) (1 diff)
• lcproc.cc (modified) (1 diff)
• nbsreadu_base.cc (modified) (1 diff)
• nbsreadu_bosse.cc (modified) (1 diff)
• nbsreadu_ppf.cc (modified) (3 diffs)
• nomfits2.c (modified) (4 diffs)
• nomfits2.h (modified) (1 diff)

trunk/FrEROS/AnaLC/anafsv.cc

@@ -64 +64 @@
 
 
-char *Pgnm = "hanafsv";
+const char *Pgnm = "hanafsv";
 
 int main(int narg, char *arg[] )

trunk/FrEROS/AnaLC/courbe_nb.cc

@@ -7 +7 @@
 
 /*==============================================================*/
-FILE *CreCourbe(char *str)
+FILE *CreCourbe(const char *str)
 /*
 Pour ouvrir le fichier COURBE_NB_FILE avec le nom "str".

trunk/FrEROS/AnaLC/courbe_nb.h

@@ -16 +16 @@
 
 FILE *CreCourbe(int et);
-FILE *CreCourbe(char *);
+FILE *CreCourbe(const char *str);
 void FillCourbe(int et,int coul
               ,float t,float flx,float eflx,float flb,float eflb

trunk/FrEROS/AnaLC/lcproc.cc

@@ -47 +47 @@
 
   // We have to check that  fgbad has been filled
-  if (fgbad.size() < nmes) 
+  if ((int)fgbad.size() < nmes) 
     for(int kb=fgbad.size(); kb<nmes; kb++) fgbad.push_back(0);
 

trunk/FrEROS/AnaLC/nbsreadu_base.cc

@@ -51 +51 @@
 
 // Create NTuple
-char *nament[NXNT] = {
+const char *nament[NXNT] = {
       "et","xref","flr","dm1","dm21","xp","yp","npt"
      ,"mean","sig","sigi"

trunk/FrEROS/AnaLC/nbsreadu_bosse.cc

@@ -59 +59 @@
 
 // Create NTuple
-char *nament[NXNT] = {
+const char *nament[NXNT] = {
       "etr","etb","fr","fb",
       "dmin1","dmin2","dm21","dm22",

trunk/FrEROS/AnaLC/nbsreadu_ppf.cc

@@ -64 +64 @@
  // Fill TimeInfoU into NTuple
  const int nxtn = 12;
- char *nament[nxtn] =
+ const char *nament[nxtn] =
    {"ts","texp","fd","sfd","sx","sy","rho","dx","dy","absor","amass","fgcal"};
  r_8 xnt[nxtn];
@@ -94 +94 @@
  // Create NTuple for StarInfo
  const int nsti = 12;
- char *namentsti[nsti] =
+ const char *namentsti[nsti] =
    {"net","xref","fmean","fsig","fref","xp","yp","dm","dm2","dm2r","fgref","nbvois"};
  for(int ic=0;ic<NCOULMX;ic++) {
@@ -138 +138 @@
 
    const int nxtn = 15;
-   char *nament[nxtn] =
+   const char *nament[nxtn] =
      {"ic",
       "ts","fd","sx","sy","rho",

trunk/FrEROS/AnaLC/nomfits2.c

@@ -93 +93 @@
 /*
 ++
-unsigned long int decode_zeza(char* s, int i1, int i2)
+unsigned long int decode_zeza(const char* s, int i1, int i2)
         Pour coder (Rc) en entier decimal la chaine de caracteres
         comprise entre `s[i1]' et `s[i2]' interpretee comme
@@ -99 +99 @@
 --
 */
-unsigned long int decode_zeza(char* s, int i1, int i2)
+unsigned long int decode_zeza(const char* s, int i1, int i2)
 {
   unsigned long int D, ibase = 1;
@@ -247 +247 @@
 /*
 ++
-int Test_NoCorrupt(char *flnm)
+int Test_NoCorrupt(const char *flnm)
         Test pour voir si le fichier Fits de nom `flnm' n'est
         pas corrompu.
@@ -260 +260 @@
 --
 */
-int Test_NoCorrupt(char *flnm)
+int Test_NoCorrupt(const char *flnm)
 {
 int lp=0;

trunk/FrEROS/AnaLC/nomfits2.h

@@ -13 +13 @@
 /* --- fin ajout depuis Peida/LibsUtil/datime.h ----- */
 
-unsigned long int decode_zeza(char* s, int i1, int i2);
+unsigned long int decode_zeza(const char* s, int i1, int i2);
 char * dec2zeza(unsigned long z, char *s, int n);
 int qSort_fits2(const void *x1,const void *x2);
 
 /* CMV: test des conneries du serveur MG ! */
-int Test_NoCorrupt(char *flnm);
+int Test_NoCorrupt(const char *flnm);
 
 /* codage de la date/tsid dans timeinfo */