gearbox-commit Mailing List for gearbox (Page 14)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 207
          http://gearbox.svn.sourceforge.net/gearbox/?rev=207&view=rev
Author:   gbiggs
Date:     2008-06-24 05:19:11 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
Changes from Michael Moser's review

Modified Paths:
--------------
    gearbox/trunk/submitted/flexiport/logfile.cpp
    gearbox/trunk/submitted/flexiport/logreaderport.cpp
    gearbox/trunk/submitted/flexiport/logreaderport.h
    gearbox/trunk/submitted/flexiport/logwriterport.cpp

Modified: gearbox/trunk/submitted/flexiport/logfile.cpp
===================================================================

--- gearbox/trunk/submitted/flexiport/logfile.cpp	2008-06-24 11:51:49 UTC (rev 206)
+++ gearbox/trunk/submitted/flexiport/logfile.cpp	2008-06-24 12:19:11 UTC (rev 207)
@@ -4,17 +4,17 @@
  * Copyright (c) 2008 Geoffrey Biggs
  *
  * flexiport flexible hardware data communications library.
- * 
- * This distribution is licensed to you under the terms described in the LICENSE file included in 
+ *
+ * This distribution is licensed to you under the terms described in the LICENSE file included in
  * this distribution.
  *
  * This work is a product of the National Institute of Advanced Industrial Science and Technology,
  * Japan. Registration number: ___
- * 
+ *
  * This file is part of flexiport.
  *
  * flexiport is free software: you can redistribute it and/or modify it under the terms of the GNU
- * Lesser General Public License as published by the Free Software Foundation, either version 3 of 
+ * Lesser General Public License as published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
  *
  * flexiport is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
@@ -28,6 +28,7 @@
 #include "flexiport.h"
 #include "logfile.h"
 
+#include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <time.h>
@@ -76,7 +77,7 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 LogFile::LogFile (unsigned int debug)
-	: _read (false), _readFile (NULL), _writeFile (NULL), _readFileSize (0), _writeFileSize (0), 
+	: _read (false), _readFile (NULL), _writeFile (NULL), _readFileSize (0), _writeFileSize (0),
 	_debug (debug), _readUsage (0), _writeUsage (0), _readSize (0), _writeSize (0),
 	_readBuffer (NULL), _writeBuffer (NULL), _ignoreTimes (false)
 //	_bufferSize (0),
@@ -112,14 +113,14 @@
 		if ((_readFile = fopen ((fileName + "r").c_str (), "r")) == NULL)
 		{
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fopen(_readFile) error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fopen(_readFile) error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
 		if ((_writeFile = fopen ((fileName + "w").c_str (), "r")) == NULL)
 		{
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fopen(_writeFile) error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fopen(_writeFile) error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
@@ -132,14 +133,14 @@
 		if ((_readFile = fopen ((fileName + "r").c_str (), "w")) == NULL)
 		{
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fopen(_readFile) error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fopen(_readFile) error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
 		if ((_writeFile = fopen ((fileName + "w").c_str (), "w")) == NULL)
 		{
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fopen(_writeFile) error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fopen(_writeFile) error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
@@ -160,7 +161,7 @@
 		{
 			_readFile = NULL;
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fclose(_readFile) error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fclose(_readFile) error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
@@ -171,7 +172,7 @@
 		{
 			_writeFile = NULL;
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fclose(_writeFile) error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fclose(_writeFile) error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
@@ -201,7 +202,7 @@
 	if ((pos = ftell (_readFile)) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -211,7 +212,7 @@
 	if ((pos = ftell (_writeFile)) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -234,14 +235,14 @@
 	if (fseek (_readFile, 0, SEEK_SET) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() fseek(_readFile) error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() fseek(_readFile) error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
 	if (fseek (_writeFile, 0, SEEK_SET) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() fseek(_writeFile) error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() fseek(_writeFile) error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -254,7 +255,7 @@
 	if (gettimeofday (&_openTime, NULL) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() gettimeofday() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() gettimeofday() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -338,24 +339,24 @@
 		{
 			if (_debug >= 2)
 				cerr << "LogFile::" << __func__ << "() Data available in file now." << endl;
-	
+
 			// Get all the data that is immediatly available and return it
 			totalRead += GetChunksToTimeLimit (_readFile, data, count, now);
 			return totalRead;
 		}
-	
+
 		// There was no data instantly, so now the timeout gets involved
 		if (timeout._sec == -1)
 		{
 			// Infinite timeout
 			if (_debug >= 2)
 				cerr << "LogFile::" << __func__ << "() Getting next chunk, no timeout." << endl;
-	
+
 			// Get the next available chunk from the file
 			struct timeval timestamp;
 			size_t size;
 			totalRead += GetSingleChunk (_readFile, data, count, timestamp, size);
-	
+
 			// Calculate the time difference between now and this chunk's timestamp
 			struct timeval diff;
 			GetCurrentFileTime (now);
@@ -380,7 +381,7 @@
 			// Limited timeout
 			if (_debug >= 2)
 				cerr << "LogFile::" << __func__ << "() Getting next chunk with timeout." << endl;
-	
+
 			// Check if there is actually data available within this time limit
 			struct timeval timeoutVal, limit;
 			timeout.AsTimeval (timeoutVal);
@@ -392,7 +393,7 @@
 				struct timeval timestamp;
 				size_t size;
 				totalRead += GetSingleChunk (_readFile, data, count, timestamp, size);
-	
+
 				// Calculate the time difference between now and this chunk's timestamp
 				struct timeval diff;
 				GetCurrentFileTime (now);
@@ -442,7 +443,7 @@
 		// Get the current file time
 		struct timeval now;
 		GetCurrentFileTime (now);
-	
+
 		// Now count data from the file
 		if (DataAvailableWithinLimit (_readFile, now))
 		{
@@ -465,12 +466,12 @@
 			// Infinite timeout
 			if (_debug >= 2)
 				cerr << "LogFile::" << __func__ << "() Getting next chunk, no timeout." << endl;
-	
+
 			// Get the next available chunk from the file
 			struct timeval timeStamp;
 			size_t size;
 			GetNextChunkInfo (_readFile, timeStamp, size);
-	
+
 			// Calculate the time difference between now and this chunk's timestamp
 			struct timeval diff;
 			GetCurrentFileTime (now);
@@ -495,7 +496,7 @@
 			// Limited timeout
 			if (_debug >= 2)
 				cerr << "LogFile::" << __func__ << "() Getting next chunk with timeout." << endl;
-	
+
 			// Check if there is actually data available within this time limit
 			struct timeval timeoutVal, limit;
 			timeout.AsTimeval (timeoutVal);
@@ -507,7 +508,7 @@
 				struct timeval timeStamp;
 				size_t size;
 				GetNextChunkInfo (_readFile, timeStamp, size);
-	
+
 				// Calculate the time difference between now and this chunk's timestamp
 				struct timeval diff;
 				GetCurrentFileTime (now);
@@ -554,7 +555,7 @@
 	if ((readFileOffset = ftell (_readFile)) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -719,7 +720,7 @@
 		if (fseek (_readFile, readFileOffset, SEEK_SET) < 0)
 		{
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
@@ -752,7 +753,7 @@
 			if (fseek (_readFile, CHUNK_HEADER_SIZE + size, SEEK_CUR) < 0)
 			{
 				stringstream ss;
-				ss << "LogFile::" << __func__ << "() fseek(_readFile) error: (" << ErrNo () << 
+				ss << "LogFile::" << __func__ << "() fseek(_readFile) error: (" << ErrNo () <<
 					") " << StrError (ErrNo ());
 				throw PortException (ss.str ());
 			}
@@ -787,7 +788,7 @@
 			if (fseek (_writeFile, CHUNK_HEADER_SIZE + size, SEEK_CUR) < 0)
 			{
 				stringstream ss;
-				ss << "LogFile::" << __func__ << "() fseek(_writeFile) error: (" << ErrNo () << 
+				ss << "LogFile::" << __func__ << "() fseek(_writeFile) error: (" << ErrNo () <<
 					") " << StrError (ErrNo ());
 				throw PortException (ss.str ());
 			}
@@ -809,7 +810,8 @@
 			" bytes." << endl;
 	}
 	WriteTimeStamp (_readFile);
-	WriteToFile (_readFile, &count, sizeof (count));
+	uint32_t temp = htonl (static_cast<uint32_t> (count));
+	WriteToFile (_readFile, &temp, sizeof (temp));
 	WriteToFile (_readFile, data, count);
 }
 
@@ -821,7 +823,8 @@
 			" bytes." << endl;
 	}
 	WriteTimeStamp (_writeFile);
-	WriteToFile (_writeFile, &count, sizeof (count));
+	uint32_t temp = htonl (static_cast<uint32_t> (count));
+	WriteToFile (_writeFile, &temp, sizeof (temp));
 	WriteToFile (_writeFile, data, count);
 }
 
@@ -956,7 +959,7 @@
 	if (gettimeofday (&now, NULL) < 0)
 	{
 		stringstream ss;
-		ss << "LogReaderPort::" << __func__ << "() gettimeofday() error: (" << ErrNo () << ") " << 
+		ss << "LogReaderPort::" << __func__ << "() gettimeofday() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -989,7 +992,7 @@
 	if (fseek (file, -1 * CHUNK_HEADER_SIZE, SEEK_CUR) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -1048,7 +1051,7 @@
 	if ((currentPos = ftell (file)) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -1071,7 +1074,7 @@
 	if (fseek (file, currentPos, SEEK_SET) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -1093,8 +1096,13 @@
 	}
 
 	// Read the chunk info
-	ReadFromFile (file, &timeStamp, sizeof (timeStamp));
-	ReadFromFile (file, &size, sizeof (size));
+	uint32_t secs, usecs, tempSize;
+	ReadFromFile (file, &secs, sizeof (secs));
+	ReadFromFile (file, &usecs, sizeof (usecs));
+	timeStamp.tv_sec = ntohl (secs);
+	timeStamp.tv_usec = ntohl (usecs);
+	ReadFromFile (file, &tempSize, sizeof (tempSize));
+	size = ntohl (tempSize);
 	if (_debug >= 3)
 		cerr << "LogFile::" << __func__ << "() Chunk is " << size << " bytes." << endl;
 
@@ -1158,7 +1166,7 @@
 	if ((currentPos = ftell (file)) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -1167,7 +1175,7 @@
 	if (fseek (file, 0, SEEK_END) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -1175,7 +1183,7 @@
 	if ((fileSize = ftell (file)) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() ftell() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -1184,7 +1192,7 @@
 	if (fseek (file, currentPos, SEEK_SET) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() fseek() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
@@ -1218,7 +1226,7 @@
 		else if (ferror (file))
 		{
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fread() error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fread() error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
@@ -1251,7 +1259,7 @@
 								sizeof (uint8_t), count - totalWritten, file)) < 0)
 		{
 			stringstream ss;
-			ss << "LogFile::" << __func__ << "() fwrite() error: (" << ErrNo () << ") " << 
+			ss << "LogFile::" << __func__ << "() fwrite() error: (" << ErrNo () << ") " <<
 				StrError (ErrNo ());
 			throw PortException (ss.str ());
 		}
@@ -1268,16 +1276,20 @@
 	if (gettimeofday (&now, NULL) < 0)
 	{
 		stringstream ss;
-		ss << "LogFile::" << __func__ << "() gettimeofday() error: (" << ErrNo () << ") " << 
+		ss << "LogFile::" << __func__ << "() gettimeofday() error: (" << ErrNo () << ") " <<
 			StrError (ErrNo ());
 		throw PortException (ss.str ());
 	}
 	timersub (&now, &_openTime, &diff);
+	uint32_t secs, usecs;
+	secs = htonl (static_cast<uint32_t> (diff.tv_sec));
+	usecs = htonl (static_cast<uint32_t> (diff.tv_usec));
 	// Write the time stamp to the file
-	WriteToFile (file, &diff, sizeof (diff));
+	WriteToFile (file, &secs, sizeof (secs));
+	WriteToFile (file, &usecs, sizeof (usecs));
 	if (_debug >= 3)
 	{
-		cerr << "LogFile::" << __func__ << "() Wrote time stamp: " << diff.tv_sec << "s " << 
+		cerr << "LogFile::" << __func__ << "() Wrote time stamp: " << diff.tv_sec << "s " <<
 			diff.tv_usec << "us (time of write is " << now.tv_sec << "s " << now.tv_usec << "us)."
 			<< endl;
 	}

Modified: gearbox/trunk/submitted/flexiport/logreaderport.cpp
===================================================================
--- gearbox/trunk/submitted/flexiport/logreaderport.cpp	2008-06-24 11:51:49 UTC (rev 206)
+++ gearbox/trunk/submitted/flexiport/logreaderport.cpp	2008-06-24 12:19:11 UTC (rev 207)
@@ -4,17 +4,17 @@
  * Copyright (c) 2008 Geoffrey Biggs
  *
  * flexiport flexible hardware data communications library.
- * 
- * This distribution is licensed to you under the terms described in the LICENSE file included in 
+ *
+ * This distribution is licensed to you under the terms described in the LICENSE file included in
  * this distribution.
  *
  * This work is a product of the National Institute of Advanced Industrial Science and Technology,
  * Japan. Registration number: ___
- * 
+ *
  * This file is part of flexiport.
  *
  * flexiport is free software: you can redistribute it and/or modify it under the terms of the GNU
- * Lesser General Public License as published by the Free Software Foundation, either version 3 of 
+ * Lesser General Public License as published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
  *
  * flexiport is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
@@ -47,7 +47,6 @@
 LogReaderPort::LogReaderPort (map<string, string> options)
 	: Port (), _logFileName ("port.log"), _strictness (0),
 	_jitter (100), _ignoreTimes (false), _open (false)
-//	_bufferSize (0), 
 {
 	_type = "logreader";
 	ProcessOptions (options);
@@ -58,7 +57,6 @@
 		throw PortException (string ("LogReaderPort::") + __func__ +
 				string ("() Failed to allocate LogFile object."));
 	}
-//	_logFile->SetBufferSize (_bufferSize);
 	_logFile->Open (_logFileName, true, _ignoreTimes);
 
 	if (_alwaysOpen)
@@ -129,7 +127,7 @@
 
 	if (_debug >= 2)
 	{
-		cerr << "LogReaderPort::" << __func__ << "() Going to read until have " << count << 
+		cerr << "LogReaderPort::" << __func__ << "() Going to read until have " << count <<
 			" bytes" << endl;
 	}
 
@@ -158,7 +156,7 @@
 				SetTimeout (oldTimeout);
 
 				stringstream ss;
-				ss << "LogReaderPort::" << __func__ << "() EOF while trying to read " << 
+				ss << "LogReaderPort::" << __func__ << "() EOF while trying to read " <<
 					count << " bytes";
 				throw PortException (ss.str ());
 			}
@@ -271,8 +269,7 @@
 	status << "LogReader-specific status:" << endl;
 	status << "Reading from " << _logFileName << endl;
 	status << ((_open && _logFile->IsOpen ()) ? "Port is open" : "Port is closed") << endl;
-//	status << "Buffer size: " << _bufferSize << endl;
-//	status << (_ignoreTimes ? "Ignoring file time stamps." : "Using file time stamps.") << endl;
+	status << (_ignoreTimes ? "Ignoring file time stamps." : "Using file time stamps.") << endl;
 	status << "Strictness is " << _strictness << ", with a jitter of " << _jitter << "ms" << endl;
 
 	return Port::GetStatus () + status.str ();
@@ -315,13 +312,6 @@
 		_logFileName = value;
 		return true;
 	}
-//	else if (option == "buffersize")
-//	{
-//		istringstream is (value);
-//		if (!(is >> _bufferSize) || is.get (c))
-//			throw PortException ("Bad buffer size: " + value);
-//		return true;
-//	}
 	else if (option == "ignoretimes")
 	{
 		_ignoreTimes = true;

Modified: gearbox/trunk/submitted/flexiport/logreaderport.h
===================================================================
--- gearbox/trunk/submitted/flexiport/logreaderport.h	2008-06-24 11:51:49 UTC (rev 206)
+++ gearbox/trunk/submitted/flexiport/logreaderport.h	2008-06-24 12:19:11 UTC (rev 207)
@@ -105,7 +105,6 @@
 	private:
 		LogFile *_logFile;
 		std::string _logFileName;
-//		unsigned int _bufferSize;
 		unsigned int _strictness;
 		int _jitter;
 		bool _ignoreTimes;

Modified: gearbox/trunk/submitted/flexiport/logwriterport.cpp
===================================================================
--- gearbox/trunk/submitted/flexiport/logwriterport.cpp	2008-06-24 11:51:49 UTC (rev 206)
+++ gearbox/trunk/submitted/flexiport/logwriterport.cpp	2008-06-24 12:19:11 UTC (rev 207)
@@ -4,17 +4,17 @@
  * Copyright (c) 2008 Geoffrey Biggs
  *
  * flexiport flexible hardware data communications library.
- * 
- * This distribution is licensed to you under the terms described in the LICENSE file included in 
+ *
+ * This distribution is licensed to you under the terms described in the LICENSE file included in
  * this distribution.
  *
  * This work is a product of the National Institute of Advanced Industrial Science and Technology,
  * Japan. Registration number: ___
- * 
+ *
  * This file is part of flexiport.
  *
  * flexiport is free software: you can redistribute it and/or modify it under the terms of the GNU
- * Lesser General Public License as published by the Free Software Foundation, either version 3 of 
+ * Lesser General Public License as published by the Free Software Foundation, either version 3 of
  * the License, or (at your option) any later version.
  *
  * flexiport is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
@@ -67,7 +67,7 @@
 	}
 	// The rest of the options go on to the underlying Port object
 
-	// Create the underlying port object 
+	// Create the underlying port object
 	_port = CreatePort (options);
 
 	// Initialise the log file
@@ -83,6 +83,7 @@
 {
 	// _logFile should never be NULL because it's allocated in the constructor and never deleted.
 	_logFile->Close ();
+	delete _logFile;
 
 	if (_port)
 		_port->Close ();
@@ -198,7 +199,7 @@
 
 	if (_debug >= 2)
 	{
-		cerr << "LogWriterPort::" << __func__ << "() Skipping until '" << terminator << 
+		cerr << "LogWriterPort::" << __func__ << "() Skipping until '" << terminator <<
 			"' is seen " << count << " times." << endl;
 	}
 	// Read bytes one at a time until either a timeout occurs or we hit the terminator byte


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2008	Jan	Feb (58)	Mar (15)	Apr (23)	May (8)	Jun (92)	Jul (66)	Aug (6)	Sep (9)	Oct (44)	Nov (8)	Dec (1)
2009	Jan (10)	Feb (8)	Mar (2)	Apr (8)	May (19)	Jun (11)	Jul (8)	Aug (6)	Sep (5)	Oct (4)	Nov (26)	Dec (4)
2010	Jan (5)	Feb (3)	Mar (4)	Apr (3)	May (4)	Jun	Jul (1)	Aug (16)	Sep (7)	Oct (3)	Nov (7)	Dec
2011	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec

gearbox-commit Mailing List for gearbox (Page 14)

gearbox-commit — Commit messages to the Gearbox SVN repository.