changed for gcc-4.4 internal compiler error

src/stream_ext.c

@@ -359,7 +359,7 @@ void extCmpRecord(int streamID, int tsID, int recID, off_t position, int param,
     Message(func, "varID = %d levelID = %d", varID, levelID);
 }
 
-
+static
 void extScanTimestep1(int streamID)
 {  
   static char func[] = "extScanTimestep1";
@@ -500,7 +500,7 @@ void extScanTimestep1(int streamID)
     }
 }
 
-
+static
 int extScanTimestep2(int streamID)
 {  
   static char func[] = "extScanTimestep2";
@@ -690,7 +690,7 @@ int extInqContents(int streamID)
   return (status);
 }
 
-
+static
 int extScanTimestep(int streamID)
 {
   static char func[] = "extScanTimestep";
@@ -765,7 +765,8 @@ int extScanTimestep(int streamID)
 
 	  param = cdiEncodeParam(rcode, 255, 255);
 
-	  if ( rindex == nrecs ) break;
+	  // if ( rindex == nrecs ) break; gcc-4.4 internal compiler error
+	  if ( rindex == nrecs ) continue;
 	  recID = streamptr->tsteps[tsID].recIDs[rindex];
 
 	  if ( rindex == 0 )

src/stream_ext.h

@@ -5,7 +5,6 @@
 #  include "extra.h"
 #endif
 
-int    extScanTimestep(int streamID);
 int    extInqContents(int streamID);
 int    extInqTimestep(int streamID, int tsID);
 

src/stream_ieg.c

@@ -871,7 +871,7 @@ void iegDateTime(int *pdb, int *date, int *time)
   *time = cdiEncodeTime(rhour, rminute, 0);
 }
 
-
+static
 void iegScanTimestep1(int streamID)
 {  
   static char func[] = "iegScanTimestep1";
@@ -1016,7 +1016,7 @@ void iegScanTimestep1(int streamID)
     }
 }
 
-
+static
 int iegScanTimestep2(int streamID)
 {  
   static char func[] = "iegScanTimestep2";
@@ -1210,7 +1210,7 @@ int iegInqContents(int streamID)
   return (status);
 }
 
-
+static
 int iegScanTimestep(int streamID)
 {
   static char func[] = "iegScanTimestep";
@@ -1287,7 +1287,8 @@ int iegScanTimestep(int streamID)
 
 	  iegDateTime(iegp->ipdb, &vdate, &vtime);
 
-	  if ( rindex == nrecs ) break;
+	  // if ( rindex == nrecs ) break; gcc-4.4 internal compiler error
+	  if ( rindex == nrecs ) continue;
 	  recID = streamptr->tsteps[tsID].recIDs[rindex];
 
 	  if ( rindex == 0 )

src/stream_ieg.h

@@ -5,7 +5,6 @@
 #  include "ieg.h"
 #endif
 
-int    iegScanTimestep(int streamID);
 int    iegInqContents(int streamID);
 int    iegInqTimestep(int streamID, int tsID);
 

src/stream_srv.c

@@ -361,7 +361,7 @@ void srvCmpRecord(int streamID, int tsID, int recID, off_t position, int param,
     Message(func, "varID = %d levelID = %d", varID, levelID);
 }
 
-
+static
 void srvScanTimestep1(int streamID)
 {  
   static char func[] = "srvScanTimestep1";
@@ -505,7 +505,7 @@ void srvScanTimestep1(int streamID)
     }
 }
 
-
+static
 int srvScanTimestep2(int streamID)
 {  
   static char func[] = "srvScanTimestep2";
@@ -693,7 +693,7 @@ int srvInqContents(int streamID)
   return (status);
 }
 
-
+static
 int srvScanTimestep(int streamID)
 {
   static char func[] = "srvScanTimestep";
@@ -769,7 +769,8 @@ int srvScanTimestep(int streamID)
 
 	  param = cdiEncodeParam(rcode, 255, 255);
 
-	  if ( rindex == nrecs ) break;
+	  // if ( rindex == nrecs ) break; gcc-4.4 internal compiler error
+	  if ( rindex == nrecs ) continue;
 	  recID = streamptr->tsteps[tsID].recIDs[rindex];
 
 	  if ( rindex == 0 )

src/stream_srv.h

@@ -5,7 +5,6 @@
 #  include "service.h"
 #endif
 
-int    srvScanTimestep(int streamID);
 int    srvInqContents(int streamID);
 int    srvInqTimestep(int streamID, int tsID);