Changeset 548

Timestamp:

02/10/11 17:52:24 (16 months ago)

Author:

acbernst

Message:

fixed a lot bugs where size_t was erroneously treated as an unsigned int / int

File:

• trunk/avango-core/src/avango/network/Msg.cpp (modified) (20 diffs)

trunk/avango-core/src/avango/network/Msg.cpp

@@ -177 +177 @@
   int32_t* arrayStart = const_cast<int32_t*>(&buf[0]); // ugly, but necessary
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), buf.size(), sizeof(int32_t),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), static_cast<uint32_t>(buf.size()), sizeof(int32_t),
              (xdrproc_t)xdr_int);
 
   msg.push(&tmpBuf[0], sizeof(int32_t)*buf.size());
-  av_pushMsg(msg, buf.size());
+  av_pushMsg(msg, static_cast<uint32_t>(buf.size()));
 }
 
@@ -187 +187 @@
 av::av_popMsg(av::Msg& msg, std::vector<int32_t>& buf)
 {
-  unsigned int arraySize;
+  uint32_t arraySize;
   av_popMsg(msg, arraySize);
 
@@ -197 +197 @@
   msg.pop(&tmpVec[0], sizeof(int32_t)*arraySize);
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), buf.size(), sizeof(int32_t),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), static_cast<uint32_t>(buf.size()), sizeof(int32_t),
              (xdrproc_t)xdr_int);
 }
@@ -238 +238 @@
   uint32_t* arrayStart = const_cast<uint32_t*>(&buf[0]); // ugly, but necessary
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), buf.size(), sizeof(uint32_t),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), static_cast<uint32_t>(buf.size()), sizeof(uint32_t),
              (xdrproc_t)xdr_u_int);
 
   msg.push(&tmpVec[0], sizeof(uint32_t)*buf.size());
-  av_pushMsg(msg, buf.size());
+  av_pushMsg(msg, static_cast<uint32_t>(buf.size()));
 }
 
@@ -248 +248 @@
 av::av_popMsg(av::Msg& msg, std::vector<uint32_t>& buf)
 {
-  unsigned int arraySize;
+  uint32_t arraySize;
   av_popMsg(msg, arraySize);
 
@@ -258 +258 @@
   msg.pop(&tmpVec[0], sizeof(uint32_t)*arraySize);
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), buf.size(), sizeof(uint32_t),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), static_cast<uint32_t>(buf.size()), sizeof(uint32_t),
              (xdrproc_t)xdr_u_int);
 }
@@ -299 +299 @@
   int64_t* arrayStart = const_cast<int64_t*>(&buf[0]); // ugly, but necessary
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), buf.size(), sizeof(int64_t),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), static_cast<uint32_t>(buf.size()), sizeof(int64_t),
              (xdrproc_t)xdr_longlong_t);
 
   msg.push(&tmpVec[0], sizeof(int64_t)*buf.size());
-  av_pushMsg(msg, buf.size());
+  av_pushMsg(msg, static_cast<uint32_t>(buf.size()));
 }
 
@@ -309 +309 @@
 av::av_popMsg(av::Msg& msg, std::vector<int64_t>& buf)
 {
-  unsigned int arraySize;
+  uint32_t arraySize;
   av_popMsg(msg, arraySize);
 
@@ -319 +319 @@
   msg.pop(&tmpVec[0], sizeof(int64_t)*arraySize);
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), buf.size(), sizeof(int64_t),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), static_cast<uint32_t>(buf.size()), sizeof(int64_t),
              (xdrproc_t)xdr_longlong_t);
 }
@@ -361 +361 @@
   uint64_t* arrayStart = const_cast<uint64_t*>(&buf[0]); // ugly, but necessary
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), buf.size(), sizeof(uint64_t),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), static_cast<uint32_t>(buf.size()), sizeof(uint64_t),
              (xdrproc_t)xdr_u_longlong_t);
 
   msg.push(&tmpVec[0], sizeof(uint64_t)*buf.size());
-  av_pushMsg(msg, buf.size());
+  av_pushMsg(msg, static_cast<uint32_t>(buf.size()));
 }
 
@@ -371 +371 @@
 av::av_popMsg(av::Msg& msg, std::vector<uint64_t>& buf)
 {
-  unsigned int arraySize;
+  uint32_t arraySize;
   av_popMsg(msg, arraySize);
 
@@ -381 +381 @@
   msg.pop(&tmpVec[0], sizeof(uint64_t)*arraySize);
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), buf.size(), sizeof(uint64_t),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), static_cast<uint32_t>(buf.size()), sizeof(uint64_t),
              (xdrproc_t)xdr_u_longlong_t);
 }
@@ -423 +423 @@
   float* arrayStart = const_cast<float*>(&buf[0]); // ugly, but necessary
 
-  xdr_vector(xdr.getXDR(), (char*)arrayStart, buf.size(), sizeof(float), (xdrproc_t)xdr_float);
+  xdr_vector(xdr.getXDR(), (char*)arrayStart, static_cast<uint32_t>(buf.size()), sizeof(float), (xdrproc_t)xdr_float);
 
   msg.push(&tmpVec[0], sizeof(float)*buf.size());
-  av_pushMsg(msg, buf.size());
+  av_pushMsg(msg, static_cast<uint32_t>(buf.size()));
 
   AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (vector<float>) [%1%]") % buf.size()))
@@ -434 +434 @@
 av::av_popMsg(av::Msg& msg, std::vector<float>& buf)
 {
-  unsigned int arraySize;
+  uint32_t arraySize;
   av_popMsg(msg, arraySize);
 
@@ -445 +445 @@
   msg.pop(&tmpVec[0], sizeof(float)*arraySize);
 
-  xdr_vector(xdr.getXDR(), (char*)&buf[0], buf.size(), sizeof(float), (xdrproc_t)xdr_float);
+  xdr_vector(xdr.getXDR(), (char*)&buf[0], static_cast<uint32_t>(buf.size()), sizeof(float), (xdrproc_t)xdr_float);
 
   AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("pop: (vector<float>) [%1%]") % buf.size()))
@@ -488 +488 @@
   double* arrayStart = const_cast<double*>(&buf[0]); // ugly, but necessary
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), buf.size(), sizeof(double),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(arrayStart), static_cast<uint32_t>(buf.size()), sizeof(double),
              (xdrproc_t)xdr_double);
 
   msg.push(&tmpVec[0], sizeof(double)*buf.size());
-  av_pushMsg(msg, buf.size());
+  av_pushMsg(msg, static_cast<uint32_t>(buf.size()));
 
   AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (vector<double>) [%1%]") % buf.size()))
@@ -500 +500 @@
 av::av_popMsg(av::Msg& msg, std::vector<double>& buf)
 {
-  unsigned int arraySize;
+  uint32_t arraySize;
   av_popMsg(msg, arraySize);
 
@@ -511 +511 @@
   msg.pop(&tmpVec[0], sizeof(double)*arraySize);
 
-  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), buf.size(), sizeof(double),
+  xdr_vector(xdr.getXDR(), reinterpret_cast<char*>(&buf[0]), static_cast<uint32_t>(buf.size()), sizeof(double),
              (xdrproc_t)xdr_double);
 
@@ -664 +664 @@
   AVANGO_LOG(logger, logging::TRACE, boost::str(boost::format("push: (std::string) [%1%]") % str));
 
-  int length = str.size();
+  uint32_t length = str.size();
   if (length)
   {
@@ -675 +675 @@
 av::av_popMsg(av::Msg& msg, std::string& str)
 {
-  int length = 0;
+  uint32_t length = 0;
   av_popMsg(msg, length);
   if (length)