[Box Backup-dev] Moving trunk to release

[Ben Summers]

On 27 Jan 2006, at 15:50, Martin Ebourne wrote:

> As I can remember, there's 4 sets of changes still awaiting merging  
> before 0.10. Here is the list as I have it, please let me know of  
> any errors/omissions.
>
> 1.
>> Fundamental type changes and missing includes, which might break  
>> some platforms, but look correct to me, can be seen with:
>>   svn diff
>>   http://bbdev.fluffy.co.uk/svn/box/chris/win32/vc2005-compile- 
>> fixes@254
>>   http://bbdev.fluffy.co.uk/svn/box/chris/win32/type-changes
>
> I reviewed this in my mail of Fri, 20 Jan 2006 01:30:29. I'm not  
> sure if Ben reviewed these. Apart from the problems I commented on,  
> I think the rest are correct fixes which should be merged.

lib/common/Test.h
lib/common/Guards.h
	-- don't make that change. Box.h is included first in .cpp files  
ONLY. Anything else can cause really weird runtime bugs with some  
versions of the STL.

lib/backupclient/BackupStoreFile.h
lib/backupclient/BackupStoreFile.cpp
	-- don't use ([unsigned] long long), use the specific int size you  
actually mean.
	(although I think there's a reason this doesn't work under MSVC. Can  
you get around it by casting the other side?)

lib/server/Protocol.h
	-- No. bool not guaranteed to be any particular size, may cause  
cross platform issues, especially if it's in Protocol!




>
> 2. Windows specific fixes:
>>   svn diff
>>   http://bbdev.fluffy.co.uk/svn/box/chris/win32/type-changes
>>   http://bbdev.fluffy.co.uk/svn/box/chris/win32/vc2005-compile-fixes
>
> Looking at this one, all the windows specific stuff looks fine.  
> There are a large number of casts in here as well though, which I  
> don't really think should be necessary.

lib/common/BoxTimeToUnix.h
	-- shouldn't that be for Win32 only?

I'm a little concerned about the casts too, especially when they get  
all over the portable code. There is nothing too offensive though,  
but I wonder whether the necessity for them is showing up problems or  
if it's just MSVC being amusing.

Usual minor comments about coding style, although I'm kind of feeling  
inclined to give up on the fine details.


>
> 3.
>> Please have a look at the branch I created for SSL keepalives, and  
>> let
>> me know if there's anything blocking it from inclusion:
>>   svn diff -r 323:326 \
>>   http://bbdev.fluffy.co.uk/svn/box/chris/diff-timeout-and-ssl- 
>> keepalive
>
> Ben has ok'd this so Chris can go ahead and merge this one.
>
> 4. Save state for restart
>
> Am I right in thinking this one is not yet in svn?

Dunno. I think it's in there somewhere, just needs isolating and  
adjusting to fit "house style".

Sorry for delay in reading changes.

Ben