git: update for git 2.0

[ps-cgit] / ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index e8e308e58d5848c721febefdf45326f76e31ff7e..7e58737f8a36d23005c4ecdd868ff8539d875233 100644 (file)
--- 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)
@@ -109,7 +101,7 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
                return;
 
        basename = cgit_repobasename(repo->url);
-       if (prefixcmp(ref, basename) != 0) {
+       if (!starts_with(ref, basename)) {
                if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
                        ref++;
                if (isdigit(ref[0])) {
@@ -247,9 +239,9 @@ void cgit_print_refs()
 
        html("<table class='list nowrap'>");
 
-       if (ctx.qry.path && !prefixcmp(ctx.qry.path, "heads"))
+       if (ctx.qry.path && starts_with(ctx.qry.path, "heads"))
                cgit_print_branches(0);
-       else if (ctx.qry.path && !prefixcmp(ctx.qry.path, "tags"))
+       else if (ctx.qry.path && starts_with(ctx.qry.path, "tags"))
                cgit_print_tags(0);
        else {
                cgit_print_branches(0);