xdl_merge(): fix a segmentation fault when refining conflicts

[git.git] / test-delta.c

diff --git a/test-delta.c b/test-delta.c
index 8751e27c6b2acd875803402383e50dbab56d3e56..795aa08377aaa9a229affaa054e243251436f755 100644 (file)
--- a/test-delta.c
+++ b/test-delta.c
@@ -8,16 +8,10 @@
  * published by the Free Software Foundation.
  */
 
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
+#include "git-compat-util.h"
 #include "delta.h"
 
-static const char *usage =
+static const char usage[] =
        "test-delta (-d|-p) <from_file> <data_file> <out_file>";
 
 int main(int argc, char *argv[])
@@ -41,6 +35,7 @@ int main(int argc, char *argv[])
        from_buf = mmap(NULL, from_size, PROT_READ, MAP_PRIVATE, fd, 0);
        if (from_buf == MAP_FAILED) {
                perror(argv[2]);
+               close(fd);
                return 1;
        }
        close(fd);
@@ -54,16 +49,19 @@ int main(int argc, char *argv[])
        data_buf = mmap(NULL, data_size, PROT_READ, MAP_PRIVATE, fd, 0);
        if (data_buf == MAP_FAILED) {
                perror(argv[3]);
+               close(fd);
                return 1;
        }
        close(fd);
 
        if (argv[1][1] == 'd')
                out_buf = diff_delta(from_buf, from_size,
-                                    data_buf, data_size, &out_size);
+                                    data_buf, data_size,
+                                    &out_size, 0);
        else
                out_buf = patch_delta(from_buf, from_size,
-                                     data_buf, data_size, &out_size);
+                                     data_buf, data_size,
+                                     &out_size);
        if (!out_buf) {
                fprintf(stderr, "delta operation failed (returned NULL)\n");
                return 1;