summaryrefslogtreecommitdiff
path: root/test-delta.c
diff options
context:
space:
mode:
authorMartin Koegler <mkoegler@auto.tuwien.ac.at>2007-05-01 09:47:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-01 09:59:08 (GMT)
commitadb7b5fc86d96fc2baf5a5c0ce12fb581b3ad275 (patch)
tree74e94f8f33ccfded71dcaeb83442c8817c9b9237 /test-delta.c
parentb5cc62f701abf8b903387a5d7c77a59f347d66fd (diff)
downloadgit-adb7b5fc86d96fc2baf5a5c0ce12fb581b3ad275.zip
git-adb7b5fc86d96fc2baf5a5c0ce12fb581b3ad275.tar.gz
git-adb7b5fc86d96fc2baf5a5c0ce12fb581b3ad275.tar.bz2
Fix compilation of test-delta
The code used write_in_full() without pulling its declarations from the header file. When header is included, usage[] collides with usage() function. Signed-off-by: Martin Koegler <mkoegler@auto.tuwien.ac.at> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'test-delta.c')
-rw-r--r--test-delta.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/test-delta.c b/test-delta.c
index 16595ef..3d885ff 100644
--- a/test-delta.c
+++ b/test-delta.c
@@ -10,8 +10,9 @@
#include "git-compat-util.h"
#include "delta.h"
+#include "cache.h"
-static const char usage[] =
+static const char usage_str[] =
"test-delta (-d|-p) <from_file> <data_file> <out_file>";
int main(int argc, char *argv[])
@@ -22,7 +23,7 @@ int main(int argc, char *argv[])
unsigned long from_size, data_size, out_size;
if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) {
- fprintf(stderr, "Usage: %s\n", usage);
+ fprintf(stderr, "Usage: %s\n", usage_str);
return 1;
}