From fa8eb3ec609c29455485dcde100b989ccd9ad99e Mon Sep 17 00:00:00 2001 From: "josh.macdonald@gmail.com" Date: Tue, 3 Aug 2010 04:21:38 +0000 Subject: release 3.0z --- xdelta3/Makefile | 2 +- xdelta3/Makefile.mingw | 2 +- xdelta3/setup.py | 2 +- xdelta3/xdelta3-main.h | 8 +-- xdelta3/xdelta3.vcproj | 152 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 159 insertions(+), 7 deletions(-) diff --git a/xdelta3/Makefile b/xdelta3/Makefile index 398c255..08f9a03 100644 --- a/xdelta3/Makefile +++ b/xdelta3/Makefile @@ -57,7 +57,7 @@ CFLAGS= -Wall -Wshadow -fno-builtin WFLAGS= -Wextra -Wsign-compare -Wconversion -Wextra -Wno-unused-parameter # $Format: "REL=$Xdelta3Version$" $ -REL=3.0y +REL=3.0z RELDIR = xdelta$(REL) diff --git a/xdelta3/Makefile.mingw b/xdelta3/Makefile.mingw index 22877b3..cfd034c 100644 --- a/xdelta3/Makefile.mingw +++ b/xdelta3/Makefile.mingw @@ -55,7 +55,7 @@ CFLAGS= -Wall -Wshadow -fno-builtin XDWINFLAGS:=-DXD3_STDIO=0 -DXD3_POSIX=0 -DXD3_WIN32=1 -DEXTERNAL_COMPRESSION=0 # $Format: "REL=$Xdelta3Version$" $ -REL=3.0y +REL=3.0z RELDIR = xdelta$(REL) diff --git a/xdelta3/setup.py b/xdelta3/setup.py index 53722bb..1d3fef5 100644 --- a/xdelta3/setup.py +++ b/xdelta3/setup.py @@ -50,7 +50,7 @@ xdelta3_ext = Extension('xdelta3main', ]) # $Format: "REL='$Xdelta3Version$'" $ -REL='3.0y' +REL='3.0z' # This provides xdelta3.main(), which calls the xdelta3 command-line main() # from python. diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index d2aa4e5..2234eaa 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h @@ -386,7 +386,7 @@ static int main_version (void) { /* $Format: " DP(RINT \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, Joshua MacDonald\n\");" $ */ - DP(RINT "Xdelta version 3.0y, Copyright (C) 2007, 2008, 2009, 2010, Joshua MacDonald\n"); + DP(RINT "Xdelta version 3.0z, Copyright (C) 2007, 2008, 2009, 2010, Joshua MacDonald\n"); DP(RINT "Xdelta comes with ABSOLUTELY NO WARRANTY.\n"); DP(RINT "This is free software, and you are welcome to redistribute it\n"); DP(RINT "under certain conditions; see \"COPYING\" for details.\n"); @@ -2727,13 +2727,13 @@ main_set_appheader (xd3_stream *stream, main_file *input, main_file *sfile) iname = main_apphead_string (input->filename); icomp = (input->compressor == NULL) ? "" : input->compressor->ident; - len = (usize_t) strlen (iname) + strlen (icomp) + 2; + len = (usize_t) strlen (iname) + (usize_t) strlen (icomp) + 2; if (sfile->filename != NULL) { sname = main_apphead_string (sfile->filename); scomp = (sfile->compressor == NULL) ? "" : sfile->compressor->ident; - len += (usize_t) strlen (sname) + strlen (scomp) + 2; + len += (usize_t) strlen (sname) + (usize_t) strlen (scomp) + 2; } else { @@ -2791,7 +2791,7 @@ main_get_appheader_params (main_file *file, char **parsed, XD3_ASSERT(file->filename_copy == NULL); file->filename_copy = - (char*) main_malloc(dlen + 2 + strlen(file->filename)); + (char*) main_malloc(dlen + 2 + (usize_t) strlen(file->filename)); strncpy(file->filename_copy, other->filename, dlen); file->filename_copy[dlen] = '/'; diff --git a/xdelta3/xdelta3.vcproj b/xdelta3/xdelta3.vcproj index c15ef55..dd4d6a2 100644 --- a/xdelta3/xdelta3.vcproj +++ b/xdelta3/xdelta3.vcproj @@ -11,6 +11,9 @@ + @@ -164,6 +167,155 @@ Name="VCPostBuildEventTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3