Changeset 2342 for branches

Timestamp:

10/18/11 18:42:06 (14 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-3473

Ready for Test: Yes

Interface Changes: No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description: Describe your changes here...

Bug fix from Malte (r2334).

Location:

branches/casa-prerelease/pre-asap

Files:

• . (modified) (1 prop)
• Makefile (modified) (1 prop)
• SConstruct (modified) (1 prop)
• apps (modified) (1 prop)
• external-alma (modified) (1 prop)
• external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
• getsvnrev.sh (modified) (1 prop)
• python (modified) (1 prop)
• src (modified) (1 prop)
• src/FillerWrapper.h (modified) (1 diff, 1 prop)
• src/SConscript (modified) (1 prop)

branches/casa-prerelease/pre-asap/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