Ignore:
Timestamp:
11/25/15 12:55:08 (8 years ago)
Author:
Takeshi Nakazato
Message:

New Development: No

JIRA Issue: No

Ready for Test: Yes

Interface Changes: Yes/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...


Make NRO reader classes warning free.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/external-alma/atnf/PKSIO/NROReader.cc

    r2940 r3066  
    8181  // Determine the type of input.
    8282  NROReader *reader = 0;
    83   std::size_t retval;
    8483  if ( inFile.isRegular() ) {
    8584    FILE *file ;
    … …  
    8786    // read LOFIL0
    8887    char buf[9];
    89     retval = fread( buf, 4, 1, file ) ;
     88    size_t retval = fread( buf, 4, 1, file ) ;
     89    if (retval < 1) {
     90      os << LogIO::SEVERE << "Failed to read data" << LogIO::POST;
     91      fclose(file);
     92      return 0;
     93    }
    9094    buf[4] = '\0' ;
    9195    // DEBUG
    … …  
    108112      delete d ;
    109113      fseek( file, size, SEEK_SET ) ;
    110       retval = fread( buf, 8, 1, file ) ;
     114      size_t retval = fread( buf, 8, 1, file ) ;
     115      if (retval < 1) {
     116        os << LogIO::SEVERE << "Failed to read data" << LogIO::POST;
     117        fclose(file);
     118        return 0;
     119      }
    111120      buf[8] = '\0' ;
    112121      // DEBUG
    … …  
    124133        delete d ;
    125134        fseek( file, size, SEEK_SET ) ;
    126         retval = fread( buf, 8, 1, file ) ;
     135        size_t retval = fread( buf, 8, 1, file ) ;
     136        if (retval < 1) {
     137          os << LogIO::SEVERE << "Failed to read data" << LogIO::POST;
     138          fclose(file);
     139          return 0;
     140        }
    127141        buf[8] = '\0' ;
    128142        // DEBUG
Note: See TracChangeset for help on using the changeset viewer.