Revision: 7253 http://playerstage.svn.sourceforge.net/playerstage/?rev=7253&view=rev Author: thjc Date: 2009-01-07 18:41:35 +0000 (Wed, 07 Jan 2009)
Log Message: ----------- Merge from 2-1 of 7250 Applied patch 2491569: adding some includes for neater compilation (v2.1.1) Modified Paths: -------------- code/player/trunk/client_libs/libplayerc++/actarrayproxy.cc code/player/trunk/client_libs/libplayerc++/opaqueproxy.cc code/player/trunk/client_libs/libplayerc++/speechproxy.cc code/player/trunk/client_libs/libplayerc++/test/test.cc code/player/trunk/server/drivers/laser/lms400_cola.cc Property Changed: ---------------- code/player/trunk/ Property changes on: code/player/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248 /code/player/trunk:6985 + /code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250 /code/player/trunk:6985 Modified: code/player/trunk/client_libs/libplayerc++/actarrayproxy.cc =================================================================== --- code/player/trunk/client_libs/libplayerc++/actarrayproxy.cc 2009-01-07 18:40:46 UTC (rev 7252) +++ code/player/trunk/client_libs/libplayerc++/actarrayproxy.cc 2009-01-07 18:41:35 UTC (rev 7253) @@ -44,6 +44,7 @@ #include "config.h" +#include <cstring> #include <cassert> #include <sstream> #include <iomanip> Modified: code/player/trunk/client_libs/libplayerc++/opaqueproxy.cc =================================================================== --- code/player/trunk/client_libs/libplayerc++/opaqueproxy.cc 2009-01-07 18:40:46 UTC (rev 7252) +++ code/player/trunk/client_libs/libplayerc++/opaqueproxy.cc 2009-01-07 18:41:35 UTC (rev 7253) @@ -43,6 +43,7 @@ #include "config.h" +#include <cstring> #include <cassert> #include <sstream> #include <iomanip> Modified: code/player/trunk/client_libs/libplayerc++/speechproxy.cc =================================================================== --- code/player/trunk/client_libs/libplayerc++/speechproxy.cc 2009-01-07 18:40:46 UTC (rev 7252) +++ code/player/trunk/client_libs/libplayerc++/speechproxy.cc 2009-01-07 18:41:35 UTC (rev 7253) @@ -40,6 +40,7 @@ /* * $Id$ */ +#include <cstring> #include <cstring> #include "playerc++.h" Modified: code/player/trunk/client_libs/libplayerc++/test/test.cc =================================================================== --- code/player/trunk/client_libs/libplayerc++/test/test.cc 2009-01-07 18:40:46 UTC (rev 7252) +++ code/player/trunk/client_libs/libplayerc++/test/test.cc 2009-01-07 18:41:35 UTC (rev 7253) @@ -5,6 +5,7 @@ # CVS: $Id$ **************************************************************************/ +#include <cstring> #include <unistd.h> #include <cstring> Modified: code/player/trunk/server/drivers/laser/lms400_cola.cc =================================================================== --- code/player/trunk/server/drivers/laser/lms400_cola.cc 2009-01-07 18:40:46 UTC (rev 7252) +++ code/player/trunk/server/drivers/laser/lms400_cola.cc 2009-01-07 18:41:35 UTC (rev 7253) @@ -10,6 +10,7 @@ #include <stddef.h> #include <sys/socket.h> #include <netdb.h> +#include <unistd.h> #include <libplayercore/playercore.h> #include "lms400_cola.h" @@ -417,7 +418,12 @@ } while (current < length); // read checksum: - read (sockfd, &cs_read, 1); + int ret = read (sockfd, &cs_read, 1); + if (ret < 1) + { + PLAYER_ERROR1("LMS400 didnt get any data in read %d",ret); + return player_data; + } for (int i = 0; i < length; i++) cs_calc ^= buffer[i]; @@ -555,7 +561,12 @@ // Read checksum: char cs_read = 0; - read (sockfd, &cs_read, 1); + int ret = read (sockfd, &cs_read, 1); + if (ret < 1) + { + PLAYER_ERROR1("LMS400 didnt get any data in read %d",ret); + return -1; + } // printf ("%d %d 0x%x\n", bufferlength, sizeof(MeasurementHeader_t), buffer[0]); if (buffer[0] == 's') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Check out the new SourceForge.net Marketplace. It is the best place to buy or sell services for just about anything Open Source. http://p.sf.net/sfu/Xq1LFB _______________________________________________ Playerstage-commit mailing list Playerstage-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/playerstage-commit