Changeset 2940 for trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc

Timestamp:

05/13/14 14:39:48 (10 years ago)

Author:

Malte Marquarding

Message:

Finally fix aall warning: deprecated conversion from string constant to 'char*'

File:

• trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc (modified) (18 diffs)

trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc

@@ -887 +887 @@
   //cout << "SCANTP(" << i << ") = " << record_->SCANTP << endl ;
   //
-  char *name1 = "" ;
-  char *name2 = "" ;
+  const char *name1 = "" ;
+  const char *name2 = "" ;
   if ( SCNCD == 0 ) {
     name1 = "DRA" ;
@@ -1683 +1683 @@
   while ( count < ARYNM && index < rowNum_ ) {
     char ctmp[5] ;
-    fread( ctmp, 1, 4, fp_ ) ;
+    std::size_t retval = fread( ctmp, 1, 4, fp_ ) ;
     ctmp[4] = '\0' ;
     //cout << "ctmp = " << ctmp << endl ;
@@ -1767 +1767 @@
   int count = 0 ;
   while ( strncmp( buf, name, strlen(name) ) != 0 && strncmp( buf, "END", 3 ) != 0 ) {
-    fread( buf, 1, 80, fp_ ) ;
+    std::size_t retval = fread( buf, 1, 80, fp_ ) ;
     buf[80] = '\0' ;
     count++ ;
@@ -1801 +1801 @@
   fseek( fp_, 0, SEEK_SET ) ;
   while ( strncmp( buf, name, strlen(name) ) != 0 && strncmp( buf, "END", 3 ) != 0 ) {
-    fread( buf, 1, 80, fp_ ) ;
+    std::size_t retval = fread( buf, 1, 80, fp_ ) ;
     buf[80] = '\0' ;
     //char bufo[9] ;
@@ -1837 +1837 @@
   fseek( fp_, 0, SEEK_SET ) ;
   while ( strncmp( buf, name, strlen(name) ) != 0 && strncmp( buf, "END", 3 ) != 0 ) {
-    fread( buf, 1, 80, fp_ ) ;
+    std::size_t retval = fread( buf, 1, 80, fp_ ) ;
     buf[80] = '\0' ;
     //char bufo[9] ;
@@ -1871 +1871 @@
   fseek( fp_, 0, SEEK_SET ) ;
   while ( strncmp( buf, name, strlen(name) ) != 0 && strncmp( buf, "END", 3 ) != 0 ) {
-    fread( buf, 1, 80, fp_ ) ;
+    std::size_t retval = fread( buf, 1, 80, fp_ ) ;
     buf[80] = '\0' ;
     char bufo[9] ;
@@ -1913 +1913 @@
   // read data
   if ( xsize < clen ) {
-    fread( v, 1, xsize, fp_ ) ;
+    std::size_t retval = fread( v, 1, xsize, fp_ ) ;
     //v[xsize] = '\0' ;
   }
   else {
-    fread( v, 1, clen-1, fp_ ) ;
+    std::size_t retval = fread( v, 1, clen-1, fp_ ) ;
     //v[clen-1] = '\0' ;
   }
@@ -1935 +1935 @@
 
   // read data
-  fread( &v, sizeof(int), 1, fp_ ) ;
+  std::size_t retval = fread( &v, sizeof(int), 1, fp_ ) ;
   if ( b == 0 ) 
     convertEndian( v ) ;
@@ -1953 +1953 @@
 
   // read data
-  fread( &v, sizeof(float), 1, fp_ ) ;
+  std::size_t retval = fread( &v, sizeof(float), 1, fp_ ) ;
   if ( b == 0 ) 
     convertEndian( v ) ;
@@ -1971 +1971 @@
 
   // read data
-  fread( &v, sizeof(double), 1, fp_ ) ;
+  std::size_t retval = fread( &v, sizeof(double), 1, fp_ ) ;
   if ( b == 0 ) 
     convertEndian( v ) ;  
@@ -1996 +1996 @@
     int clen = strlen( v[i] ) ;
     if ( clen > xsize ) {
-      fread( v[i], 1, xsize, fp_ ) ;
+      std::size_t retval = fread( v[i], 1, xsize, fp_ ) ;
       //v[i][xsize] = '\0' ;
     }
     else {
-      fread( v[i], 1, clen, fp_ ) ;
+      std::size_t retval = fread( v[i], 1, clen, fp_ ) ;
       //v[i][clen-1] = '\0' ;
     }
@@ -2019 +2019 @@
 
   for ( unsigned int i = 0 ; i < v.size() ; i++ ) {
-    fread( &v[i], 1, sizeof(int), fp_ ) ;
+    std::size_t retval = fread( &v[i], 1, sizeof(int), fp_ ) ;
     if ( b == 0 ) 
       convertEndian( v[i] ) ;
@@ -2038 +2038 @@
 
   for ( unsigned int i = 0 ; i < v.size() ; i++ ) {
-    fread( &v[i], 1, sizeof(float), fp_ ) ;
+    std::size_t retval = fread( &v[i], 1, sizeof(float), fp_ ) ;
     if ( b == 0 ) 
       convertEndian( v[i] ) ;
@@ -2057 +2057 @@
 
   for ( unsigned int i = 0 ; i < v.size() ; i++ ) {
-    fread( &v[i], 1, sizeof(double), fp_ ) ;
+    std::size_t retval = fread( &v[i], 1, sizeof(double), fp_ ) ;
     if ( b == 0 ) 
       convertEndian( v[i] ) ;
@@ -2087 +2087 @@
 //     int clen = (int)strlen( v[i] ) ;
 //     if ( clen > xsize ) {
-//       fread( v[i], 1, xsize, fp_ ) ;
+//       std::size_t retval = fread( v[i], 1, xsize, fp_ ) ;
 //       //v[i][xsize] = '\0' ;
 //     }
 //     else {
-//       fread( v[i], 1, clen-1, fp_ ) ;
+//       std::size_t retval = fread( v[i], 1, clen-1, fp_ ) ;
 //       //v[i][clen-1] = '\0' ;
 //     }
     char c[xsize+1] ;
-    fread( c, 1, xsize, fp_ ) ;
+    std::size_t retval = fread( c, 1, xsize, fp_ ) ;
     c[xsize] = '\0' ;
     v[i] = string( c ) ;
@@ -2118 +2118 @@
     int offset = scanLen_ * arrayid_[i] + sizeof(int) * idx ;
     fseek( fp_, offset, SEEK_CUR ) ;
-    fread( &v[i], 1, sizeof(int), fp_ ) ;
+    std::size_t retval = fread( &v[i], 1, sizeof(int), fp_ ) ;
     if ( b == 0 ) 
       convertEndian( v[i] ) ;
@@ -2141 +2141 @@
     int offset = scanLen_ * arrayid_[i] + sizeof(float) * idx ;
     fseek( fp_, offset, SEEK_CUR ) ;
-    fread( &v[i], 1, sizeof(float), fp_ ) ;
+    std::size_t retval = fread( &v[i], 1, sizeof(float), fp_ ) ;
     if ( b == 0 ) 
       convertEndian( v[i] ) ;
@@ -2164 +2164 @@
     int offset = scanLen_ * arrayid_[i] + sizeof(double) * idx ;
     fseek( fp_, offset, SEEK_CUR ) ;
-    fread( &v[i], 1, sizeof(double), fp_ ) ;
+    std::size_t retval = fread( &v[i], 1, sizeof(double), fp_ ) ;
     if ( b == 0 ) 
       convertEndian( v[i] ) ;