From 254aaa6033913a359d825085494f2f3e9676f69e Mon Sep 17 00:00:00 2001 From: josch Date: Wed, 5 Nov 2014 13:21:51 +0100 Subject: [PATCH] fix testsuite problems --- tests/indent.sh | 6 +++++- utils/xdelta3.c | 6 +++--- utils/xdelta3.h | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tests/indent.sh b/tests/indent.sh index 2cc6919..bb81b61 100755 --- a/tests/indent.sh +++ b/tests/indent.sh @@ -13,8 +13,12 @@ case $# in ;; esac -find "$source_dir" -name "*.c" -o -name "*.h" \! -path "$source_dir/3rdparty/*" | while read f; do +source_dir=`readlink -f "$source_dir"` + +find "$source_dir" -name "*.c" -o -name "*.h" | while read f; do case $f in + ${source_dir}/3rdparty/*) + ;; ${source_dir}/*/CMakeFiles/*) ;; ${source_dir}/CMakeFiles/*) diff --git a/utils/xdelta3.c b/utils/xdelta3.c index 6fda254..e0f29f4 100644 --- a/utils/xdelta3.c +++ b/utils/xdelta3.c @@ -20,10 +20,10 @@ #include #include #include -#include #undef _POSIX_SOURCE #include "../3rdparty/xdelta3-3.0.8/xdelta3.h" #include "../3rdparty/xdelta3-3.0.8/xdelta3.c" +#include "../3rdparty/xdelta3-3.0.8/xdelta3-decode.h" //--------------------------------------------------------------------------- static int code(int encode, FILE * InFile, FILE * SrcFile, FILE * OutFile, @@ -104,12 +104,12 @@ static int code(int encode, FILE * InFile, FILE * SrcFile, FILE * OutFile, return 0; } -int xdelta3_diff(FILE *old, FILE *new, FILE *diff) +int xdelta3_diff(FILE * old, FILE * new, FILE * diff) { return code(1, new, old, diff, 0x1000); } -int xdelta3_patch(FILE *old, FILE *diff, FILE *new) +int xdelta3_patch(FILE * old, FILE * diff, FILE * new) { return code(0, diff, old, new, 0x1000); } diff --git a/utils/xdelta3.h b/utils/xdelta3.h index 03b6645..5b6fea4 100644 --- a/utils/xdelta3.h +++ b/utils/xdelta3.h @@ -21,7 +21,7 @@ #include -int xdelta3_diff(FILE *old, FILE *new, FILE *diff); -int xdelta3_patch(FILE *old, FILE *diff, FILE *new); +int xdelta3_diff(FILE * old, FILE * new, FILE * diff); +int xdelta3_patch(FILE * old, FILE * diff, FILE * new); #endif