80c9e70ebe
We have a bunch of loops which iterate up to an unsigned boundary using a signed index, which generates warnigs because we compare a signed and unsigned value in the loop condition. Address these sites for trivial cases and enable `-Wsign-compare` warnings for these code units. This patch only adapts those code units where we can drop the `DISABLE_SIGN_COMPARE_WARNINGS` macro in the same step. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
75 lines
1.9 KiB
C
75 lines
1.9 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "test-lib.h"
|
|
#include "object.h"
|
|
#include "decorate.h"
|
|
#include "repository.h"
|
|
|
|
struct test_vars {
|
|
struct object *one, *two, *three;
|
|
struct decoration n;
|
|
int decoration_a, decoration_b;
|
|
};
|
|
|
|
static void t_add(struct test_vars *vars)
|
|
{
|
|
void *ret = add_decoration(&vars->n, vars->one, &vars->decoration_a);
|
|
|
|
check(ret == NULL);
|
|
ret = add_decoration(&vars->n, vars->two, NULL);
|
|
check(ret == NULL);
|
|
}
|
|
|
|
static void t_readd(struct test_vars *vars)
|
|
{
|
|
void *ret = add_decoration(&vars->n, vars->one, NULL);
|
|
|
|
check(ret == &vars->decoration_a);
|
|
ret = add_decoration(&vars->n, vars->two, &vars->decoration_b);
|
|
check(ret == NULL);
|
|
}
|
|
|
|
static void t_lookup(struct test_vars *vars)
|
|
{
|
|
void *ret = lookup_decoration(&vars->n, vars->one);
|
|
|
|
check(ret == NULL);
|
|
ret = lookup_decoration(&vars->n, vars->two);
|
|
check(ret == &vars->decoration_b);
|
|
ret = lookup_decoration(&vars->n, vars->three);
|
|
check(ret == NULL);
|
|
}
|
|
|
|
static void t_loop(struct test_vars *vars)
|
|
{
|
|
int objects_noticed = 0;
|
|
|
|
for (size_t i = 0; i < vars->n.size; i++) {
|
|
if (vars->n.entries[i].base)
|
|
objects_noticed++;
|
|
}
|
|
check_int(objects_noticed, ==, 2);
|
|
}
|
|
|
|
int cmd_main(int argc UNUSED, const char **argv UNUSED)
|
|
{
|
|
struct object_id one_oid = { { 1 } }, two_oid = { { 2 } }, three_oid = { { 3 } };
|
|
struct test_vars vars = { 0 };
|
|
|
|
vars.one = lookup_unknown_object(the_repository, &one_oid);
|
|
vars.two = lookup_unknown_object(the_repository, &two_oid);
|
|
vars.three = lookup_unknown_object(the_repository, &three_oid);
|
|
|
|
TEST(t_add(&vars),
|
|
"Add 2 objects, one with a non-NULL decoration and one with a NULL decoration.");
|
|
TEST(t_readd(&vars),
|
|
"When re-adding an already existing object, the old decoration is returned.");
|
|
TEST(t_lookup(&vars),
|
|
"Lookup returns the added declarations, or NULL if the object was never added.");
|
|
TEST(t_loop(&vars), "The user can also loop through all entries.");
|
|
|
|
clear_decoration(&vars.n, NULL);
|
|
|
|
return test_done();
|
|
}
|