[PATCH 3/3] ui-patch: Rename variables
Lukas Fleischer
cgit at cryptocrack.de
Thu Aug 15 19:06:36 CEST 2013
Rename parameters and local variables to match those from ui-diff. Also,
convert a "char *" to "const char *".
Signed-off-by: Lukas Fleischer <cgit at cryptocrack.de>
---
ui-patch.c | 28 +++++++++++++++-------------
ui-patch.h | 3 ++-
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/ui-patch.c b/ui-patch.c
index a93ba45..3d124af 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -11,38 +11,40 @@
#include "html.h"
#include "ui-shared.h"
-void cgit_print_patch(char *hex, const char *old_rev, const char *prefix)
+void cgit_print_patch(const char *new_rev, const char *old_rev,
+ const char *prefix)
{
struct rev_info rev;
struct commit *commit;
- unsigned char sha1[20], old_sha1[20];
+ unsigned char new_rev_sha1[20], old_rev_sha1[20];
char rev_range[2 * 20 + 2];
char *rev_argv[] = { NULL, "--reverse", rev_range };
char *patchname;
- if (!hex)
- hex = ctx.qry.head;
+ if (!new_rev)
+ new_rev = ctx.qry.head;
- if (get_sha1(hex, sha1)) {
- cgit_print_error("Bad object id: %s", hex);
+ if (get_sha1(new_rev, new_rev_sha1)) {
+ cgit_print_error("Bad object id: %s", new_rev);
return;
}
- commit = lookup_commit_reference(sha1);
+ commit = lookup_commit_reference(new_rev_sha1);
if (!commit) {
- cgit_print_error("Bad commit reference: %s", hex);
+ cgit_print_error("Bad commit reference: %s", new_rev);
return;
}
if (old_rev)
- get_sha1(old_rev, old_sha1);
+ get_sha1(old_rev, old_rev_sha1);
else if (commit->parents && commit->parents->item)
- hashcpy(old_sha1, commit->parents->item->object.sha1);
+ hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
else
- hashclr(old_sha1);
+ hashclr(old_rev_sha1);
- sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1), sha1_to_hex(sha1));
+ sprintf(rev_range, "%s..%s", sha1_to_hex(old_rev_sha1),
+ sha1_to_hex(new_rev_sha1));
- patchname = fmt("%s.patch", sha1_to_hex(sha1));
+ patchname = fmt("%s.patch", sha1_to_hex(new_rev_sha1));
ctx.page.mimetype = "text/plain";
ctx.page.filename = patchname;
cgit_print_http_headers(&ctx);
diff --git a/ui-patch.h b/ui-patch.h
index acd37fd..7a6cacd 100644
--- a/ui-patch.h
+++ b/ui-patch.h
@@ -1,6 +1,7 @@
#ifndef UI_PATCH_H
#define UI_PATCH_H
-extern void cgit_print_patch(char *hex, const char *old_rev, const char *prefix);
+extern void cgit_print_patch(const char *new_rev, const char *old_rev,
+ const char *prefix);
#endif /* UI_PATCH_H */
--
1.8.4.rc2.477.g1da3ebd
More information about the CGit
mailing list