PATCH: Fix compile on FC3 (was Re: [Box Backup] Some problems)

[Martin Ebourne]

This message is in MIME format.

--=_3w8d8honiyrk
Content-Type: text/plain; charset="windows-1256"; format="flowed"
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

Ben Summers <ben at fluffy.co.uk> wrote:
> I want to sort out compilation on Fedora 3 (downloading now!) then fix
> a couple of minor problems, then I'll do another preview release.

Didn't realise it was broken!

Anyhow, here's a patch to fix it. I'm sure installing FC3 will still be fun
though.

Compiled and checked tests on i686, all ok.

Side note: I've mostly done the solaris port. Turned out to be a lot more
than I'd bargained for. So far tests in common, compress, crypto, raidfile,
and basicserver have passed. Now trying to solve a fail in backupstore. This
test at testbackupstore.cpp:1276 fails sometimes:

TEST_THAT(dir.GetAttributesModTime() == 329483209443598LL);

If it does then the next test at 1278 also fails:

TEST_THAT(dir.GetAttributes() == attrtest);

Either way, these tests at 1354-5 always fail:

TEST_THAT(foundCurrent);
TEST_THAT(foundOld);

Looks like some data is getting corrupted during the protocol transfer or
something. I've not been able to find a good way of debugging this after an
hour or so. Any ideas? Are there tests in any of the other directories I
should run before this one?

Cheers,

Martin.


--=_3w8d8honiyrk
Content-Type: text/x-patch; charset="UTF-8"; name="box-fc3.patch"
Content-Disposition: attachment; filename="box-fc3.patch"
Content-Transfer-Encoding: 7bit

diff -ur boxbackup-0.08.orig/lib/server/ServerStream.h boxbackup-0.08/lib/server/ServerStream.h
--- boxbackup-0.08.orig/lib/server/ServerStream.h	2004-09-23 10:56:06.000000000 +0100
+++ boxbackup-0.08/lib/server/ServerStream.h	2004-11-12 16:13:40.637653864 +0000
@@ -159,7 +159,7 @@
 			// BLOCK
 			{
 				// Get the address we need to bind to
-				const Configuration &config(GetConfiguration());
+				const Configuration &config(this->GetConfiguration());
 				const Configuration &server(config.GetSubConfiguration("Server"));
 				std::string addrs = server.GetKeyValue("ListenAddresses");
 	
diff -ur boxbackup-0.08.orig/lib/server/ServerTLS.h boxbackup-0.08/lib/server/ServerTLS.h
--- boxbackup-0.08.orig/lib/server/ServerTLS.h	2004-09-23 10:56:06.000000000 +0100
+++ boxbackup-0.08/lib/server/ServerTLS.h	2004-11-12 16:13:57.210134464 +0000
@@ -85,7 +85,7 @@
 	{
 		// First, set up the SSL context.
 		// Get parameters from the configuration
-		const Configuration &conf(GetConfiguration());
+		const Configuration &conf(this->GetConfiguration());
 		const Configuration &serverconf(conf.GetSubConfiguration("Server"));
 		std::string certFile(serverconf.GetKeyValue("CertificateFile"));
 		std::string keyFile(serverconf.GetKeyValue("PrivateKeyFile"));
@@ -99,7 +99,7 @@
 	virtual void HandleConnection(SocketStreamTLS &rStream)
 	{
 		rStream.Handshake(mContext, true /* is server */);
-		Connection(rStream);
+		this->Connection(rStream);
 	}
 	
 private:
diff -ur boxbackup-0.08.orig/test/basicserver/testbasicserver.cpp boxbackup-0.08/test/basicserver/testbasicserver.cpp
--- boxbackup-0.08.orig/test/basicserver/testbasicserver.cpp	2004-09-23 10:56:06.000000000 +0100
+++ boxbackup-0.08/test/basicserver/testbasicserver.cpp	2004-11-12 16:14:32.849716424 +0000
@@ -315,7 +315,7 @@
 		"1 tset", "storrac", "selppaenip", "!ooob", 0
 	};
 	
-	IOStreamGetLine **getline = new (IOStreamGetLine*)[conns.size()];
+	IOStreamGetLine **getline = new IOStreamGetLine*[conns.size()];
 	for(unsigned int c = 0; c < conns.size(); ++c)
 	{
 		getline[c] = new IOStreamGetLine(*conns[c]);

--=_3w8d8honiyrk--