Changeset 18845

Timestamp:

Aug 1, 2008, 8:33:14 AM (18 years ago)

Author:

Paul Price

Message:

Need to check return value of fwrite to avoid compiler warning on some
systems. It's a good thing to do anyway.

Location:

trunk/psModules/src/objects

Files:

• pmSourceIO_CMP.c (modified) (5 diffs)
• pmSourceIO_SX.c (modified) (4 diffs)

trunk/psModules/src/objects/pmSourceIO_CMP.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-10 01:09:20 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-01 18:33:01 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -113 +113 @@
         pmSource *source = (pmSource *) sources->data[i];
 
-        // no difference between PSF and non-PSF model
+        // no difference between PSF and non-PSF model
         pmModel *model = pmSourceGetModel (NULL, source);
         if (model == NULL)
@@ -140 +140 @@
         psLineAdd (line, "%6.2f ",  axes.minor);
         psLineAdd (line, "%5.1f\n", axes.theta);
-        fwrite (line->line, 1, line->Nline, f);
+        if (fwrite(line->line, 1, line->Nline, f) < line->Nline) {
+            psError(PS_ERR_IO, true, "Unable to write CMP sources file (%s)", filename);
+            fclose(f);
+            psFree(line);
+            return false;
+        }
     }
     fclose (f);
@@ -233 +238 @@
                 int Nskip = c2 - c;
                 nbytes -= Nskip;
-                memset(buffer + nbytes, '\0', Nskip);
+                memset(buffer + nbytes, '\0', Nskip);
                 psLogMsg (__func__, 4, "deleted line, %d extra chars\n", Nskip);
             } else {
@@ -277 +282 @@
                 goto skip_source;
 
-            pmPSF_AxesToModel (PAR, axes);
+            pmPSF_AxesToModel (PAR, axes);
 
             psArrayAdd (sources, 100, source);

trunk/psModules/src/objects/pmSourceIO_SX.c

@@ -3 +3 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-10 01:09:20 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-01 18:33:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -60 +60 @@
         pmSource *source = (pmSource *) sources->data[i];
 
-        // no difference between PSF and non-PSF model
+        // no difference between PSF and non-PSF model
         pmModel *model = pmSourceGetModel (NULL, source);
         if (model == NULL)
@@ -70 +70 @@
         // pmSourceSextractType (source, &type, &flags);
 
-        axes = pmPSF_ModelToAxes (PAR, 20.0);
+        axes = pmPSF_ModelToAxes (PAR, 20.0);
 
         psLineInit (line);
@@ -85 +85 @@
         psLineAdd (line, "%9.4f",  source->apMag);
         psLineAdd (line, "%4d\n",  0); // should be flags
-        fwrite (line->line, 1, line->Nline, f);
+        if (fwrite(line->line, 1, line->Nline, f) < line->Nline) {
+            psError(PS_ERR_IO, true, "Unable to write SX sources file (%s)", filename);
+            fclose(f);
+            psFree(line);
+            return false;
+        }
     }
     fclose (f);