Merge branch 'master' into next

[git.git] / test-delta.c

diff --git a/test-delta.c b/test-delta.c
index e5d31ca..89eb68e 100644 (file)
--- a/test-delta.c
+++ b/test-delta.c
@@ -17,7 +17,7 @@
 #include <sys/mman.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[])
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
        if (argv[1][1] == 'd')
                out_buf = diff_delta(from_buf, from_size,
                                     data_buf, data_size,
-                                    &out_size, 0);
+                                    &out_size, 0, NULL);
        else
                out_buf = patch_delta(from_buf, from_size,
                                      data_buf, data_size,