Changeset 2334 for trunk

Timestamp:

10/06/11 13:23:28 (13 years ago)

Author:

Malte Marquarding

Message:

Mergen in fix from asap-4.0.0 tag

File:

• trunk/src/FillerWrapper.h (modified) (1 diff, 1 prop)

trunk/src/FillerWrapper.h

@@ -92 +92 @@
       ret = pks ;
     else if ( file.isReadable() ) {
+      // if we want to compare to 6 characters we should only read in 6
       FILE *f = fopen( filename.c_str(), "r") ;
-      char buf[8] ;
-      fread( buf, 6, 1, f ) ;
+      char buf[7] ;
+      size_t tmp = fread( buf, 6, 1, f ) ;
+      (void *)tmp;
       fclose( f ) ;
-      buf[7]='\0' ;
+      buf[6]='\0' ;
       // NRO data has two types:
       //  1) specific binary data for OTF observation