* [PATCH 1/2] ui-refs.c: Remove global header variable
@ 2013-04-06 21:39 cgit
2013-04-06 21:39 ` [PATCH 2/2] ui-refs.c: Refactor print_tag() cgit
0 siblings, 1 reply; 2+ messages in thread
From: cgit @ 2013-04-06 21:39 UTC (permalink / raw)
print_tag_header() is only called from cgit_print_tags() -- the
conditional invocation in print_tag() is never executed since
print_tag() is only called by cgit_print_tags() which already executes
print_tag_header() before (resulting in the global variable being always
set in when the condition is evaluated).
Remove the global variable and the conditional invocation.
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
ui-refs.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/ui-refs.c b/ui-refs.c
index 5bebed1..0399e6b 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -11,8 +11,6 @@
#include "html.h"
#include "ui-shared.h"
-static int header;
-
static int cmp_age(int age1, int age2)
{
if (age1 != 0 && age2 != 0)
@@ -96,7 +94,6 @@ static void print_tag_header()
"<th class='left'>Download</th>"
"<th class='left'>Author</th>"
"<th class='left' colspan='2'>Age</th></tr>\n");
- header = 1;
}
static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
@@ -156,8 +153,6 @@ static int print_tag(struct refinfo *ref)
cgit_print_age(info->tagger_date, -1, NULL);
html("</td></tr>\n");
} else {
- if (!header)
- print_tag_header();
html("<tr><td>");
cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
html("</td><td>");
@@ -221,7 +216,6 @@ void cgit_print_tags(int maxcount)
struct reflist list;
int i;
- header = 0;
list.refs = NULL;
list.alloc = list.count = 0;
for_each_tag_ref(cgit_refs_cb, &list);
--
1.8.2.674.g2c8b7bf
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] ui-refs.c: Refactor print_tag()
2013-04-06 21:39 [PATCH 1/2] ui-refs.c: Remove global header variable cgit
@ 2013-04-06 21:39 ` cgit
0 siblings, 0 replies; 2+ messages in thread
From: cgit @ 2013-04-06 21:39 UTC (permalink / raw)
The code snippets for OBJ_TAG and other object types are almost
equivalent. Merge them and use a couple of inline if conditions to
select proper fields.
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
ui-refs.c | 56 +++++++++++++++++++++++++++-----------------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/ui-refs.c b/ui-refs.c
index 0399e6b..7406478 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -127,47 +127,45 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
if (free_ref)
free((char *)ref);
}
+
static int print_tag(struct refinfo *ref)
{
- struct tag *tag;
- struct taginfo *info;
+ struct tag *tag = NULL;
+ struct taginfo *info = NULL;
char *name = (char *)ref->refname;
+ struct object *obj = ref->object;
- if (ref->object->type == OBJ_TAG) {
- tag = (struct tag *)ref->object;
+ if (obj->type == OBJ_TAG) {
+ tag = (struct tag *)obj;
+ obj = tag->tagged;
info = ref->tag;
if (!tag || !info)
return 1;
- html("<tr><td>");
- cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
- html("</td><td>");
- if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
- print_tag_downloads(ctx.repo, name);
- else
- cgit_object_link(tag->tagged);
- html("</td><td>");
+ }
+
+ html("<tr><td>");
+ cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+ html("</td><td>");
+ if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
+ print_tag_downloads(ctx.repo, name);
+ else
+ cgit_object_link(obj);
+ html("</td><td>");
+ if (info) {
if (info->tagger)
html(info->tagger);
- html("</td><td colspan='2'>");
+ } else if (ref->object->type == OBJ_COMMIT) {
+ html(ref->commit->author);
+ }
+ html("</td><td colspan='2'>");
+ if (info) {
if (info->tagger_date > 0)
cgit_print_age(info->tagger_date, -1, NULL);
- html("</td></tr>\n");
- } else {
- html("<tr><td>");
- cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
- html("</td><td>");
- if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
- print_tag_downloads(ctx.repo, name);
- else
- cgit_object_link(ref->object);
- html("</td><td>");
- if (ref->object->type == OBJ_COMMIT)
- html(ref->commit->author);
- html("</td><td colspan='2'>");
- if (ref->object->type == OBJ_COMMIT)
- cgit_print_age(ref->commit->commit->date, -1, NULL);
- html("</td></tr>\n");
+ } else if (ref->object->type == OBJ_COMMIT) {
+ cgit_print_age(ref->commit->commit->date, -1, NULL);
}
+ html("</td></tr>\n");
+
return 0;
}
--
1.8.2.674.g2c8b7bf
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-06 21:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-06 21:39 [PATCH 1/2] ui-refs.c: Remove global header variable cgit
2013-04-06 21:39 ` [PATCH 2/2] ui-refs.c: Refactor print_tag() cgit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).