kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

reflog expire: use "switch" over enum values 

Change code added in 03cb91b18c (reflog --expire-unreachable: special
case entries in "HEAD" reflog, 2010-04-09) to use a "switch" statement
with an exhaustive list of "case" statements instead of doing numeric
comparisons against the enum labels.

Now we won't assume that "x != UE_ALWAYS" means "(x == UE_HEAD || x ||
UE_NORMAL)". That assumption is true now, but we'd introduce subtle
bugs here if that were to change, now the compiler will notice and
error out on such errors.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2021-12-22 05:06:43 +01:00 committed by Junio C Hamano
parent f2919bae98
commit 20d6b6868c
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
builtin/reflog.c
View File

@ -303,10 +303,15 @@ static int should_expire_reflog_ent(struct object_id *ooid, struct object_id *no
return 1; return 1;


if (timestamp < cb->cmd.expire_unreachable) { if (timestamp < cb->cmd.expire_unreachable) {
if (cb->unreachable_expire_kind == UE_ALWAYS) switch (cb->unreachable_expire_kind) {
return 1; case UE_ALWAYS:
if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
return 1; return 1;
case UE_NORMAL:
case UE_HEAD:
if (unreachable(cb, old_commit, ooid) || unreachable(cb, new_commit, noid))
return 1;
break;
}
} }


if (cb->cmd.recno && --(cb->cmd.recno) == 0) if (cb->cmd.recno && --(cb->cmd.recno) == 0)
@ -348,6 +353,7 @@ static void reflog_expiry_prepare(const char *refname,
void *cb_data) void *cb_data)
{ {
struct expire_reflog_policy_cb *cb = cb_data; struct expire_reflog_policy_cb *cb = cb_data;
struct commit_list *elem;


if (!cb->cmd.expire_unreachable || is_head(refname)) { if (!cb->cmd.expire_unreachable || is_head(refname)) {
cb->unreachable_expire_kind = UE_HEAD; cb->unreachable_expire_kind = UE_HEAD;
@ -363,34 +369,37 @@ static void reflog_expiry_prepare(const char *refname,
if (cb->cmd.expire_unreachable <= cb->cmd.expire_total) if (cb->cmd.expire_unreachable <= cb->cmd.expire_total)
cb->unreachable_expire_kind = UE_ALWAYS; cb->unreachable_expire_kind = UE_ALWAYS;


if (cb->unreachable_expire_kind != UE_ALWAYS) { switch (cb->unreachable_expire_kind) {
if (cb->unreachable_expire_kind == UE_HEAD) { case UE_ALWAYS:
struct commit_list *elem; return;

case UE_HEAD:
for_each_ref(push_tip_to_list, &cb->tips); for_each_ref(push_tip_to_list, &cb->tips);
for (elem = cb->tips; elem; elem = elem->next) for (elem = cb->tips; elem; elem = elem->next)
commit_list_insert(elem->item, &cb->mark_list); commit_list_insert(elem->item, &cb->mark_list);
} else { break;
commit_list_insert(cb->tip_commit, &cb->mark_list); case UE_NORMAL:
} commit_list_insert(cb->tip_commit, &cb->mark_list);
cb->mark_limit = cb->cmd.expire_total;
mark_reachable(cb);
} }
cb->mark_limit = cb->cmd.expire_total;
mark_reachable(cb);
} }


static void reflog_expiry_cleanup(void *cb_data) static void reflog_expiry_cleanup(void *cb_data)
{ {
struct expire_reflog_policy_cb *cb = cb_data; struct expire_reflog_policy_cb *cb = cb_data;
struct commit_list *elem;


if (cb->unreachable_expire_kind != UE_ALWAYS) { switch (cb->unreachable_expire_kind) {
if (cb->unreachable_expire_kind == UE_HEAD) { case UE_ALWAYS:
struct commit_list *elem; return;
for (elem = cb->tips; elem; elem = elem->next) case UE_HEAD:
clear_commit_marks(elem->item, REACHABLE); for (elem = cb->tips; elem; elem = elem->next)
free_commit_list(cb->tips); clear_commit_marks(elem->item, REACHABLE);
} else { free_commit_list(cb->tips);
clear_commit_marks(cb->tip_commit, REACHABLE); break;
} case UE_NORMAL:
clear_commit_marks(cb->tip_commit, REACHABLE);
break;
} }
} }