code cleanup + style, functionally equivalent - stagit-gopher - A git gopher frontend. (mirror)

git clone git://bitreich.org/stagit-gopher/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/stagit-gopher/

Log

Files

Refs

Tags

README

LICENSE

---

commit c13c4119501291e5c276d4d1217491b16a2a7ff9

parent 254f215e5007592127b9e760a01bd1747e1cf71e

Author: Hiltjo Posthuma 

Date:   Sun,  1 May 2016 14:09:42 +0200

code cleanup + style, functionally equivalent

Diffstat:
  M stagit-index.c                      |       2 +-
  M stagit.c                            |      30 +++++++++++-------------------

2 files changed, 12 insertions(+), 20 deletions(-)
---

diff --git a/stagit-index.c b/stagit-index.c

@@ -92,11 +92,11 @@ writefooter(FILE *fp)
 int
 writelog(FILE *fp)
 {
-        char *stripped_name = NULL, *p;
         git_commit *commit = NULL;
         const git_signature *author;
         git_revwalk *w = NULL;
         git_oid id;
+        char *stripped_name = NULL, *p;
         int ret = 0;
 
         git_revwalk_new(&w, repo);

diff --git a/stagit.c b/stagit.c

@@ -141,7 +141,6 @@ commitinfo_free(struct commitinfo *ci)
 
         if (!ci)
                 return;
-
         if (ci->deltas)
                 for (i = 0; i < ci->ndeltas; i++)
                         deltainfo_free(ci->deltas[i]);
@@ -158,15 +157,13 @@ commitinfo_getbyoid(const git_oid *id)
 {
         struct commitinfo *ci;
         git_diff_options opts;
-        const git_oid *oid;
-        int error;
 
         if (!(ci = calloc(1, sizeof(struct commitinfo))))
                 err(1, "calloc");
 
-        ci->id = id;
         if (git_commit_lookup(&(ci->commit), repo, id))
                 goto err;
+        ci->id = id;
 
         git_oid_tostr(ci->oid, sizeof(ci->oid), git_commit_id(ci->commit));
         git_oid_tostr(ci->parentoid, sizeof(ci->parentoid), git_commit_parent_id(ci->commit, 0));
@@ -175,12 +172,10 @@ commitinfo_getbyoid(const git_oid *id)
         ci->summary = git_commit_summary(ci->commit);
         ci->msg = git_commit_message(ci->commit);
 
-        oid = git_commit_tree_id(ci->commit);
-        if ((error = git_tree_lookup(&(ci->commit_tree), repo, oid)))
+        if (git_tree_lookup(&(ci->commit_tree), repo, git_commit_tree_id(ci->commit)))
                 goto err;
-        if (!(error = git_commit_parent(&(ci->parent), ci->commit, 0))) {
-                oid = git_commit_tree_id(ci->parent);
-                if ((error = git_tree_lookup(&(ci->parent_tree), repo, oid))) {
+        if (!git_commit_parent(&(ci->parent), ci->commit, 0)) {
+                if (git_tree_lookup(&(ci->parent_tree), repo, git_commit_tree_id(ci->parent))) {
                         ci->parent = NULL;
                         ci->parent_tree = NULL;
                 }
@@ -188,9 +183,8 @@ commitinfo_getbyoid(const git_oid *id)
 
         git_diff_init_options(&opts, GIT_DIFF_OPTIONS_VERSION);
         opts.flags |= GIT_DIFF_DISABLE_PATHSPEC_MATCH;
-        if ((error = git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts)))
+        if (git_diff_tree_to_tree(&(ci->diff), repo, ci->parent_tree, ci->commit_tree, &opts))
                 goto err;
-
         if (commitinfo_getstats(ci) == -1)
                 goto err;
 
@@ -423,8 +417,7 @@ printshowfile(FILE *fp, struct commitinfo *ci)
         const git_diff_hunk *hunk;
         const git_diff_line *line;
         git_patch *patch;
-        size_t nhunks, nhunklines, changed, add, del, total;
-        size_t i, j, k;
+        size_t nhunks, nhunklines, changed, add, del, total, i, j, k;
         char linestr[80];
 
         printcommit(fp, ci);
@@ -652,7 +645,7 @@ writeatom(FILE *fp)
         struct commitinfo *ci;
         git_revwalk *w = NULL;
         git_oid id;
-        size_t i, m = 100; /* max */
+        size_t i, m = 100; /* last 'm' commits */
 
         fputs("\n"
               "\n