about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2014-02-26 16:57:15 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2014-02-26 16:57:15 +0100
commit493061102653ac6483dc3c9649c726318e2488b6 (patch)
treed84a326c43c297d240b6d26e7d82075fa9fd8c28
parentRemove unused parameter from cgit_print_snapshot() (diff)
downloadcgit-pink-493061102653ac6483dc3c9649c726318e2488b6.tar.gz
cgit-pink-493061102653ac6483dc3c9649c726318e2488b6.zip
ui-refs: simplify cmp_age logic
The check in parse_user that eventually makes it into committer_date and
tagger_date is:

else if (mode == 3 && isdigit(*p)) {
    *date = atol(p);
    mode++;
}

Since isdigit('-') is always false, date will never be negative. Thus
the sign of this function:

static int cmp_age(int age1, int age2)
{
    if (age1 != 0 && age2 != 0)
        return age2 - age1;

    if (age1 == 0 && age2 == 0)
        return 0;

    if (age1 == 0)
        return +1;

    return -1;
}

Will always be the same as the sign of this function:

static inline int cmp_age(int age1, int age2)
{
    return age2 - age1;
}

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Idea-by: Lukas Fleischer <cgit@cryptocrack.de>
-rw-r--r--ui-refs.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/ui-refs.c b/ui-refs.c
index e8e308e..0da063f 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -11,18 +11,10 @@
 #include "html.h"
 #include "ui-shared.h"
 
-static int cmp_age(int age1, int age2)
+static inline int cmp_age(int age1, int age2)
 {
-	if (age1 != 0 && age2 != 0)
-		return age2 - age1;
-
-	if (age1 == 0 && age2 == 0)
-		return 0;
-
-	if (age1 == 0)
-		return +1;
-
-	return -1;
+	/* age1 and age2 are assumed to be non-negative */
+	return age2 - age1;
 }
 
 static int cmp_ref_name(const void *a, const void *b)