[Box Backup-commit] COMMIT r3542 - in box/trunk: bin/bbackupd lib/common lib/server

[subversion at boxbackup.org]

Author: chris
Date: 2015-04-06 12:17:55 +0000 (Mon, 06 Apr 2015)
New Revision: 3542

Modified:
   box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp
   box/trunk/lib/common/Archive.h
   box/trunk/lib/common/IOStream.cpp
   box/trunk/lib/server/SocketStreamTLS.cpp
Log:
Whitespace and semicolon-after-macro fixes.

Modified: box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp	2015-04-06 12:17:47 UTC (rev 3541)
+++ box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp	2015-04-06 12:17:55 UTC (rev 3542)
@@ -207,7 +207,7 @@
 //			 int64_t &, int64_t &) const
 //		Purpose: Looks up an inode in the map, returning true if it
 //			 exists, and the object ids of it and the directory
-//			 it's in the reference arguments. 
+//			 it's in the reference arguments.
 //		Created: 11/11/03
 //
 // --------------------------------------------------------------------------

Modified: box/trunk/lib/common/Archive.h
===================================================================
--- box/trunk/lib/common/Archive.h	2015-04-06 12:17:47 UTC (rev 3541)
+++ box/trunk/lib/common/Archive.h	2015-04-06 12:17:55 UTC (rev 3542)
@@ -26,7 +26,7 @@
 {
 public:
 	Archive(IOStream &Stream, int Timeout)
-		: mrStream(Stream)
+	: mrStream(Stream)
 	{
 		mTimeout = Timeout;
 	}
@@ -38,6 +38,7 @@
 	~Archive()
 	{
 	}
+
 	//
 	//
 	//
@@ -104,7 +105,7 @@
 			0 /* not interested in bytes read if this fails */,
 			mTimeout))
 		{
-			THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead)
+			THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead);
 		}
 		rItemOut = ntohl(privItem);
 	}
@@ -125,7 +126,7 @@
 		else
 		{
 			// bad number of remaining bytes
-			THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead)
+			THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead);
 		}
 	}
 	void Read(int64_t &rItemOut)
@@ -135,7 +136,7 @@
 			0 /* not interested in bytes read if this fails */,
 			mTimeout))
 		{
-			THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead)
+			THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead);
 		}
 		rItemOut = box_ntoh64(privItem);
 	}
@@ -147,7 +148,7 @@
 			0 /* not interested in bytes read if this fails */,
 			mTimeout))
 		{
-			THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead)
+			THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead);
 		}
 		rItemOut = box_ntoh64(privItem);
 	}
@@ -167,9 +168,12 @@
 		if(size < (int) sizeof(buf))
 		{
 			// Fetch rest of pPayload, relying on the Protocol to error on stupidly large sizes for us
-			if(!mrStream.ReadFullBuffer(buf, size, 0 /* not interested in bytes read if this fails */, mTimeout))
+			if(!mrStream.ReadFullBuffer(buf, size,
+				0 /* not interested in bytes read if this fails */,
+				mTimeout))
 			{
-				THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead)
+				THROW_EXCEPTION(CommonException,
+					ArchiveBlockIncompleteRead);
 			}
 			// assign to this string, storing the header and the extra payload
 			rItemOut.assign(buf, size);
@@ -181,9 +185,12 @@
 			char *ppayload = dataB;
 
 			// Fetch rest of pPayload, relying on the Protocol to error on stupidly large sizes for us
-			if(!mrStream.ReadFullBuffer(ppayload, size, 0 /* not interested in bytes read if this fails */, mTimeout))
+			if(!mrStream.ReadFullBuffer(ppayload, size,
+				0 /* not interested in bytes read if this fails */,
+				mTimeout))
 			{
-				THROW_EXCEPTION(CommonException, ArchiveBlockIncompleteRead)
+				THROW_EXCEPTION(CommonException,
+					ArchiveBlockIncompleteRead);
 			}
 			// assign to this string, storing the header and the extra pPayload
 			rItemOut.assign(ppayload, size);

Modified: box/trunk/lib/common/IOStream.cpp
===================================================================
--- box/trunk/lib/common/IOStream.cpp	2015-04-06 12:17:47 UTC (rev 3541)
+++ box/trunk/lib/common/IOStream.cpp	2015-04-06 12:17:55 UTC (rev 3542)
@@ -127,8 +127,8 @@
 // Function
 //		Name:    IOStream::ReadFullBuffer(void *, int, int)
 //		Purpose: Reads bytes into buffer, returning whether or not it managed to
-//				 get all the bytes required. Exception and abort use of stream
-//				 if this returns false.
+//			 get all the bytes required. Exception and abort use of stream
+//			 if this returns false.
 //		Created: 2003/08/26
 //
 // --------------------------------------------------------------------------

Modified: box/trunk/lib/server/SocketStreamTLS.cpp
===================================================================
--- box/trunk/lib/server/SocketStreamTLS.cpp	2015-04-06 12:17:47 UTC (rev 3541)
+++ box/trunk/lib/server/SocketStreamTLS.cpp	2015-04-06 12:17:55 UTC (rev 3542)
@@ -271,7 +271,7 @@
 	{
 		return 0;
 	}
-	
+
 	while(true)
 	{
 		int r = ::SSL_read(mpSSL, pBuffer, NBytes);