Task #7631: Updated all marshalling functions.

MAC/APL/CR_Protocol/src/CRreadRequest.cc

@@ -47,9 +47,9 @@ size_t CRreadRequest::getSize()
 
 size_t CRreadRequest::pack  (char* buffer) const
 {
-	uint32 offset = 0;
-	MSH_pack(buffer, offset, stationList);	
-	MSH_pack(buffer, offset, rcuList);	
+	size_t offset = 0;
+	offset = MSH_pack(buffer, offset, stationList);	
+	offset = MSH_pack(buffer, offset, rcuList);	
 	offset += readTime.pack((char*)(buffer)+offset);
 	offset += timeBefore.pack((char*)(buffer)+offset);
 	offset += timeAfter.pack((char*)(buffer)+offset);
@@ -58,9 +58,9 @@ size_t CRreadRequest::pack  (char* buffer) const
 
 size_t CRreadRequest::unpack(const char *buffer)
 {
-	uint32 offset = 0;
-	MSH_unpack(buffer, offset, stationList);	
-	MSH_unpack(buffer, offset, rcuList);	
+	size_t offset = 0;
+	offset = MSH_unpack(buffer, offset, stationList);	
+	offset = MSH_unpack(buffer, offset, rcuList);	
 	offset += readTime.unpack((char*)(buffer)+offset);
 	offset += timeBefore.unpack((char*)(buffer)+offset);
 	offset += timeAfter.unpack((char*)(buffer)+offset);

MAC/APL/CR_Protocol/src/CRrecordRequest.cc

@@ -47,17 +47,17 @@ size_t CRrecordRequest::getSize()
 
 size_t CRrecordRequest::pack  (char* buffer) const
 {
-	uint32 offset = 0;
-	MSH_pack(buffer, offset, stationList);	
-	MSH_pack(buffer, offset, rcuList);	
+	size_t offset = 0;
+	offset = MSH_pack(buffer, offset, stationList);	
+	offset = MSH_pack(buffer, offset, rcuList);	
 	return (offset);
 }
 
 size_t CRrecordRequest::unpack(const char *buffer)
 {
-	uint32 offset = 0;
-	MSH_unpack(buffer, offset, stationList);	
-	MSH_unpack(buffer, offset, rcuList);	
+	size_t offset = 0;
+	offset = MSH_unpack(buffer, offset, stationList);	
+	offset = MSH_unpack(buffer, offset, rcuList);	
 	return (offset);
 }
 

MAC/APL/CR_Protocol/src/CRstopRequest.cc

@@ -47,18 +47,18 @@ size_t CRstopRequest::getSize()
 
 size_t CRstopRequest::pack  (char* buffer) const
 {
-	uint32 offset = 0;
-	MSH_pack(buffer, offset, stationList);	
-	MSH_pack(buffer, offset, rcuList);	
+	size_t offset = 0;
+	offset = MSH_pack(buffer, offset, stationList);	
+	offset = MSH_pack(buffer, offset, rcuList);	
 	offset += stopTime.pack(buffer + offset);
 	return (offset);
 }
  
 size_t CRstopRequest::unpack(const char *buffer)
 {
-	uint32 offset = 0;
-	MSH_unpack(buffer, offset, stationList);	
-	MSH_unpack(buffer, offset, rcuList);	
+	size_t offset = 0;
+	offset = MSH_unpack(buffer, offset, stationList);	
+	offset = MSH_unpack(buffer, offset, rcuList);	
 	offset += stopTime.unpack(buffer + offset);
 	return (offset);
 }

MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc

@@ -88,8 +88,8 @@ size_t AntennaGains::pack(char* buffer) const
   size_t offset = 0;
 
   lock();
-  MSH_pack(buffer, offset, m_gains);
-  MSH_pack(buffer, offset, m_quality);
+  offset = MSH_pack(buffer, offset, m_gains);
+  offset = MSH_pack(buffer, offset, m_quality);
   memcpy((char*)buffer + offset, &m_done, sizeof(bool));
   offset += sizeof(bool);
   unlock();
@@ -102,8 +102,8 @@ size_t AntennaGains::unpack(const char* buffer)
   size_t offset = 0;
 
   lock();
-  MSH_unpack(buffer, offset, m_gains);
-  MSH_unpack(buffer, offset, m_quality);
+  offset = MSH_unpack(buffer, offset, m_gains);
+  offset = MSH_unpack(buffer, offset, m_quality);
   memcpy(&m_done, (char*)buffer + offset, sizeof(bool));
   offset += sizeof(bool);
   unlock();

MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc

@@ -148,9 +148,9 @@ size_t SpectralWindow::getSize() const
 
 size_t SpectralWindow::pack(char* buffer) const
 {
-  uint32 offset = 0;
+  size_t offset = 0;
 
-  MSH_pack(buffer, offset, m_name);
+  offset = MSH_pack(buffer, offset, m_name);
   memcpy(buffer + offset, &m_sampling_freq, sizeof(m_sampling_freq));
   offset += sizeof(m_sampling_freq);
   memcpy(buffer + offset, &m_nyquist_zone, sizeof(m_nyquist_zone));
@@ -165,9 +165,9 @@ size_t SpectralWindow::pack(char* buffer) const
 
 size_t SpectralWindow::unpack(const char* buffer)
 {
-  uint32 offset = 0;
+  size_t offset = 0;
 
-  MSH_unpack(buffer, offset, m_name);
+  offset = MSH_unpack(buffer, offset, m_name);
   memcpy(&m_sampling_freq, buffer + offset, sizeof(m_sampling_freq));
   offset += sizeof(m_sampling_freq);
   memcpy(&m_nyquist_zone, buffer + offset, sizeof(m_nyquist_zone));

MAC/APL/PAC/CAL_Protocol/src/SubArray.cc

@@ -210,13 +210,13 @@ size_t SubArray::getSize() const
 
 size_t SubArray::pack(char* buffer) const
 {
-	uint32 offset = 0;
+	size_t offset = 0;
 
-	MSH_pack(buffer, offset, m_name);
-	MSH_pack(buffer, offset, m_geoloc);
-	MSH_pack(buffer, offset, m_pos);
-	MSH_pack(buffer, offset, m_rcuindex);
-	MSH_pack(buffer, offset, itsRCUmask);
+	offset = MSH_pack(buffer, offset, m_name);
+	offset = MSH_pack(buffer, offset, m_geoloc);
+	offset = MSH_pack(buffer, offset, m_pos);
+	offset = MSH_pack(buffer, offset, m_rcuindex);
+	offset = MSH_pack(buffer, offset, itsRCUmask);
 	offset += m_spw.pack(buffer + offset);
 
 	return offset;
@@ -224,13 +224,13 @@ size_t SubArray::pack(char* buffer) const
 
 size_t SubArray::unpack(const char* buffer)
 {
-	uint32 offset = 0;
+	size_t offset = 0;
 
-	MSH_unpack(buffer, offset, m_name);
-	MSH_unpack(buffer, offset, m_geoloc);
-	MSH_unpack(buffer, offset, m_pos);
-	MSH_unpack(buffer, offset, m_rcuindex);
-	MSH_unpack(buffer, offset, itsRCUmask);
+	offset = MSH_unpack(buffer, offset, m_name);
+	offset = MSH_unpack(buffer, offset, m_geoloc);
+	offset = MSH_unpack(buffer, offset, m_pos);
+	offset = MSH_unpack(buffer, offset, m_rcuindex);
+	offset = MSH_unpack(buffer, offset, itsRCUmask);
 	offset += m_spw.unpack(buffer + offset);
 
 	return offset;
@@ -245,15 +245,13 @@ size_t SubArrayMap::getSize() const
 
 size_t SubArrayMap::pack(char* buffer) const
 {
-	uint32 offset = 0;
-	MSH_pack(buffer, offset, (*this));
-	return (offset);
+	size_t offset = 0;
+	return MSH_pack(buffer, offset, (*this));
 }
 
 size_t SubArrayMap::unpack(const char* buffer)
 {
-	uint32 offset = 0;
-	MSH_unpack(buffer, offset, (*this));
-	return (offset);
+	size_t offset = 0;
+	return MSH_unpack(buffer, offset, (*this));
 }
 

MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc

@@ -58,9 +58,7 @@ size_t Beamlet2SubbandMap::pack  (char* buffer) const
 		maparray(i+1) = iter->second;
 	}
 
-	MSH_pack(buffer, offset, maparray);
-
-	return offset;
+	return MSH_pack(buffer, offset, maparray);
 }
 
 size_t Beamlet2SubbandMap::unpack(const char *buffer)
@@ -69,7 +67,7 @@ size_t Beamlet2SubbandMap::unpack(const char *buffer)
 	blitz::Array<uint16, 1> maparray;
 
 	size_t offset = 0;
-	MSH_unpack(buffer, offset, maparray);
+	offset = MSH_unpack(buffer, offset, maparray);
 	ASSERT(maparray.extent(firstDim) % 2 == 0);
 
 	// convert Blitz array to map

MAC/APL/PAC/IBS_Protocol/src/Pointing.cc

@@ -102,7 +102,7 @@ size_t Pointing::getSize() const
 //
 size_t Pointing::pack  (char* buffer) const
 {
-	uint32 offset = 0;
+	size_t offset = 0;
 
 	memcpy(buffer + offset, &itsAngle2Pi, sizeof(double));
 	offset += sizeof(double);
@@ -121,7 +121,7 @@ size_t Pointing::pack  (char* buffer) const
 //
 size_t Pointing::unpack(const char *buffer)
 {
-	uint32 offset = 0;
+	size_t offset = 0;
 
 	memcpy(&itsAngle2Pi, buffer + offset, sizeof(double));
 	offset += sizeof(double);

MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc

@@ -79,8 +79,8 @@ size_t AntennaGains::pack(char* buffer) const
 {
   size_t offset = 0;
 
-  MSH_pack(buffer, offset, m_gains);
-  MSH_pack(buffer, offset, m_quality);
+  offset = MSH_pack(buffer, offset, m_gains);
+  offset = MSH_pack(buffer, offset, m_quality);
 
   return offset;
 }
@@ -89,8 +89,8 @@ size_t AntennaGains::unpack(const char* buffer)
 {
   size_t offset = 0;
 
-  MSH_unpack(buffer, offset, m_gains);
-  MSH_unpack(buffer, offset, m_quality);
+  offset = MSH_unpack(buffer, offset, m_gains);
+  offset = MSH_unpack(buffer, offset, m_quality);
 
   return offset;
 }

MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc

@@ -114,9 +114,9 @@ size_t SpectralWindow::getSize() const
 
 size_t SpectralWindow::pack(char* buffer) const
 {
-  uint32 offset = 0;
+  size_t offset = 0;
 
-  MSH_pack(buffer, offset, itsName);
+  offset = MSH_pack(buffer, offset, itsName);
   memcpy(buffer + offset, &itsSamplingFreq, sizeof(itsSamplingFreq));
   offset += sizeof(itsSamplingFreq);
   memcpy(buffer + offset, &itsNyquistZone, sizeof(itsNyquistZone));
@@ -129,9 +129,9 @@ size_t SpectralWindow::pack(char* buffer) const
 
 size_t SpectralWindow::unpack(const char* buffer)
 {
-  uint32 offset = 0;
+  size_t offset = 0;
 
-  MSH_unpack(buffer, offset, itsName);
+  offset = MSH_unpack(buffer, offset, itsName);
   memcpy(&itsSamplingFreq, buffer + offset, sizeof(itsSamplingFreq));
   offset += sizeof(itsSamplingFreq);
   memcpy(&itsNyquistZone, buffer + offset, sizeof(itsNyquistZone));

MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc

@@ -199,11 +199,11 @@ size_t SubArray::getSize() const
 
 size_t SubArray::pack(char* buffer) const
 {
-	uint32 offset = 0;
+	size_t offset = 0;
 
-	MSH_pack(buffer, offset, itsName);
-	MSH_pack(buffer, offset, itsAntennaSet);
-	MSH_pack(buffer, offset, itsRCUmask);
+	offset = MSH_pack(buffer, offset, itsName);
+	offset = MSH_pack(buffer, offset, itsAntennaSet);
+	offset = MSH_pack(buffer, offset, itsRCUmask);
 	offset += itsSPW.pack(buffer + offset);
 
 	return offset;
@@ -211,11 +211,11 @@ size_t SubArray::pack(char* buffer) const
 
 size_t SubArray::unpack(const char* buffer)
 {
-	uint32 offset = 0;
+	size_t offset = 0;
 
-	MSH_unpack(buffer, offset, itsName);
-	MSH_unpack(buffer, offset, itsAntennaSet);
-	MSH_unpack(buffer, offset, itsRCUmask);
+	offset = MSH_unpack(buffer, offset, itsName);
+	offset = MSH_unpack(buffer, offset, itsAntennaSet);
+	offset = MSH_unpack(buffer, offset, itsRCUmask);
 	offset += itsSPW.unpack(buffer + offset);
 
 	return offset;
@@ -230,16 +230,14 @@ size_t SubArrayMap::getSize() const
 
 size_t SubArrayMap::pack(char* buffer) const
 {
-	uint32	offset = 0;
-	MSH_pack(buffer, offset, (*this));
-	return (offset);
+	size_t	offset = 0;
+	return MSH_pack(buffer, offset, (*this));
 }
 
 size_t SubArrayMap::unpack(const char* buffer)
 {
-	uint32 offset = 0;
-	MSH_unpack(buffer, offset, (*this));
-	return (offset);
+	size_t offset = 0;
+	return MSH_unpack(buffer, offset, (*this));
 }
 
   } // namespace ICAL

MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc

@@ -47,19 +47,13 @@ namespace LOFAR {
     size_t RspStatus::pack  (char* buffer) const
     {
       size_t offset = 0;
-      
-      MSH_pack(buffer, offset, m_board_status);
-      
-      return offset;
+      return MSH_pack(buffer, offset, m_board_status);
     }
     
     size_t RspStatus::unpack(const char *buffer)
     {
       size_t offset = 0;
-      
-      MSH_unpack(buffer, offset, m_board_status);
-      
-      return offset;
+      return MSH_unpack(buffer, offset, m_board_status);
     }
   }
 }

MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc

@@ -40,19 +40,13 @@ namespace LOFAR {
     size_t XCStatistics::pack  (char* buffer) const
     {
       size_t offset = 0;
-      
-      MSH_pack(buffer, offset, m_xstatistics);
-
-      return offset;
+      return MSH_pack(buffer, offset, m_xstatistics);
     }
     
     size_t XCStatistics::unpack(const char *buffer) 
     {
       size_t offset = 0;
-      
-      MSH_unpack(buffer, offset, m_xstatistics);
-      
-      return offset;
+      return MSH_unpack(buffer, offset, m_xstatistics);
     }
   }
 }

MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc

@@ -39,13 +39,11 @@ size_t BeamletWeights::getSize() const
 size_t BeamletWeights::pack  (char* buffer) const
 {
   size_t offset = 0;
-  MSH_pack(buffer, offset, m_weights);
-  return offset;
+  return MSH_pack(buffer, offset, m_weights);
 }
 
 size_t BeamletWeights::unpack(const char *buffer)
 {
   size_t offset = 0;
-  MSH_unpack(buffer, offset, m_weights);
-  return offset;
+  return MSH_unpack(buffer, offset, m_weights);
 }

MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc

@@ -39,17 +39,11 @@ size_t BitmodeInfo::getSize() const
 size_t BitmodeInfo::pack  (char* buffer) const
 {
   size_t offset = 0;
-
-  MSH_pack(buffer, offset, itsBitmodeInfo);
-
-  return offset;
+  return MSH_pack(buffer, offset, itsBitmodeInfo);
 }
 
 size_t BitmodeInfo::unpack(const char *buffer)
 {
   size_t offset = 0;
-
-  MSH_unpack(buffer, offset, itsBitmodeInfo);
-
-  return offset;
+  return MSH_unpack(buffer, offset, itsBitmodeInfo);
 }

MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc

@@ -40,15 +40,13 @@ size_t BypassSettings::getSize() const
 size_t BypassSettings::pack  (char* buffer) const
 {
   size_t offset = 0;
-  MSH_pack(buffer, offset, m_registers);
-  return offset;
+  return MSH_pack(buffer, offset, m_registers);
 }
 
 size_t BypassSettings::unpack(const char *buffer)
 {
   size_t offset = 0;
-  MSH_unpack(buffer, offset, m_registers);
-  return offset;
+  return MSH_unpack(buffer, offset, m_registers);
 }
 
   } // namespace RSP_Protocol

MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc

@@ -39,17 +39,11 @@ size_t HBASettings::getSize() const
 size_t HBASettings::pack  (char* buffer) const
 {
   size_t offset = 0;
-  
-  MSH_pack(buffer, offset, m_delay);
-
-  return offset;
+  return MSH_pack(buffer, offset, m_delay);
 }
 
 size_t HBASettings::unpack(const char *buffer)
 {
   size_t offset = 0;
-
-  MSH_unpack(buffer, offset, m_delay);
-
-  return offset;
+  return MSH_unpack(buffer, offset, m_delay);
 }

MAC/APL/PIC/RSP_Protocol/src/Latency.cc

@@ -44,17 +44,11 @@ size_t Latency::getSize() const
 size_t Latency::pack  (char* buffer) const
 {
   size_t offset = 0;
-  
-  MSH_pack(buffer, offset, itsLatency);
-
-  return offset;
+  return MSH_pack(buffer, offset, itsLatency);
 }
 
 size_t Latency::unpack(const char *buffer)
 {
   size_t offset = 0;
-  
-  MSH_unpack(buffer, offset, itsLatency);
-
-  return offset;
+  return MSH_unpack(buffer, offset, itsLatency);
 }

MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc

@@ -83,17 +83,11 @@ size_t RCUSettings::getSize() const
 size_t RCUSettings::pack  (char* buffer) const
 {
   size_t offset = 0;
-  
-  MSH_pack(buffer, offset, m_registers);
-
-  return offset;
+  return MSH_pack(buffer, offset, m_registers);
 }
 
 size_t RCUSettings::unpack(const char *buffer)
 {
   size_t offset = 0;
-
-  MSH_unpack(buffer, offset, m_registers);
-
-  return offset;
+  return MSH_unpack(buffer, offset, m_registers);
 }

MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc

@@ -40,17 +40,11 @@ size_t RSUSettings::getSize() const
 size_t RSUSettings::pack  (char * buffer) const
 {
   size_t offset = 0;
-  
-  MSH_pack(buffer, offset, m_registers);
-
-  return offset;
+  return MSH_pack(buffer, offset, m_registers);
 }
 
 size_t RSUSettings::unpack(const char *buffer)
 {
   size_t offset = 0;
-
-  MSH_unpack(buffer, offset, m_registers);
-
-  return offset;
+  return MSH_unpack(buffer, offset, m_registers);
 }