From 24b7d1e7b07aa1329d0d75f7922af8ef3e0782d2 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 23 Apr 2020 16:59:07 -0400 Subject: test-bloom: fix some whitespace issues Signed-off-by: Jeff King Reviewed-by: Taylor Blau Signed-off-by: Junio C Hamano --- t/helper/test-bloom.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 't') diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c index ce412664ba..f9c0ce2bae 100644 --- a/t/helper/test-bloom.c +++ b/t/helper/test-bloom.c @@ -27,7 +27,7 @@ static void print_bloom_filter(struct bloom_filter *filter) { } printf("Filter_Length:%d\n", (int)filter->len); printf("Filter_Data:"); - for (i = 0; i < filter->len; i++){ + for (i = 0; i < filter->len; i++) { printf("%02x|", filter->data[i]); } printf("\n"); @@ -50,13 +50,13 @@ int cmd__bloom(int argc, const char **argv) printf("Murmur3 Hash with seed=0:0x%08x\n", hashed); } - if (!strcmp(argv[1], "generate_filter")) { + if (!strcmp(argv[1], "generate_filter")) { struct bloom_filter filter; int i = 2; filter.len = (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD; filter.data = xcalloc(filter.len, sizeof(unsigned char)); - if (!argv[2]){ + if (!argv[2]) { die("at least one input string expected"); } @@ -68,7 +68,7 @@ int cmd__bloom(int argc, const char **argv) print_bloom_filter(&filter); } - if (!strcmp(argv[1], "get_filter_for_commit")) { + if (!strcmp(argv[1], "get_filter_for_commit")) { struct object_id oid; const char *end; if (parse_oid_hex(argv[2], &oid, &end)) @@ -78,4 +78,4 @@ int cmd__bloom(int argc, const char **argv) } return 0; -} \ No newline at end of file +} -- cgit v1.2.3 From 1b4c57fa87e121f155863f898dc39d06cf4a1d99 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 23 Apr 2020 16:59:14 -0400 Subject: test-bloom: check that we have expected arguments If "test-tool bloom" is not fed a command, or if arguments are missing for some commands, it will just segfault. Let's check argc and write a friendlier usage message. Signed-off-by: Jeff King Reviewed-by: Taylor Blau Signed-off-by: Junio C Hamano --- t/helper/test-bloom.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 't') diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c index f9c0ce2bae..77eb27adac 100644 --- a/t/helper/test-bloom.c +++ b/t/helper/test-bloom.c @@ -43,10 +43,21 @@ static void get_bloom_filter_for_commit(const struct object_id *commit_oid) print_bloom_filter(filter); } +static const char *bloom_usage = "\n" +" test-tool bloom get_murmer3 \n" +" test-tool bloom generate_filter [...]\n" +" test-tool get_filter_for_commit \n"; + int cmd__bloom(int argc, const char **argv) { + if (argc < 2) + usage(bloom_usage); + if (!strcmp(argv[1], "get_murmur3")) { - uint32_t hashed = murmur3_seeded(0, argv[2], strlen(argv[2])); + uint32_t hashed; + if (argc < 3) + usage(bloom_usage); + hashed = murmur3_seeded(0, argv[2], strlen(argv[2])); printf("Murmur3 Hash with seed=0:0x%08x\n", hashed); } @@ -56,9 +67,8 @@ int cmd__bloom(int argc, const char **argv) filter.len = (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD; filter.data = xcalloc(filter.len, sizeof(unsigned char)); - if (!argv[2]) { - die("at least one input string expected"); - } + if (argc - 1 < i) + usage(bloom_usage); while (argv[i]) { add_string_to_filter(argv[i], &filter); @@ -71,6 +81,8 @@ int cmd__bloom(int argc, const char **argv) if (!strcmp(argv[1], "get_filter_for_commit")) { struct object_id oid; const char *end; + if (argc < 3) + usage(bloom_usage); if (parse_oid_hex(argv[2], &oid, &end)) die("cannot parse oid '%s'", argv[2]); init_bloom_filters(); -- cgit v1.2.3