{"thread":{"id":"5822","subject":"[PATCH 1/6] blame.c: whitespace and formatting clean-up.","startedAt":"2006-10-05T21:00:55Z","lastAt":"2006-10-05T21:00:55Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"28248","messageId":"7vsli2eauw.fsf@assigned-by-dhcp.cox.net","threadId":"5822","inReplyTo":null,"subject":"[PATCH 1/6] blame.c: whitespace and formatting clean-up.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-10-05T21:00:55Z","receivedAt":"2006-10-05T21:00:55Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\nSigned-off-by: Junio C Hamano <junkio@cox.net>\n---\n blame.c |  200 +++++++++++++++++++++++++++++++-------------------------------\n 1 files changed, 100 insertions(+), 100 deletions(-)\n\ndiff --git a/blame.c b/blame.c\nindex 8cfd5d9..394b5c3 100644\n--- a/blame.c\n+++ b/blame.c\n@@ -20,16 +20,17 @@ #include \"xdiff-interface.h\"\n \n #define DEBUG 0\n \n-static const char blame_usage[] = \"git-blame [-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\\n\"\n-\t\"  -c, --compatibility Use the same output mode as git-annotate (Default: off)\\n\"\n-\t\"  -l, --long          Show long commit SHA1 (Default: off)\\n\"\n-\t\"  -t, --time          Show raw timestamp (Default: off)\\n\"\n-\t\"  -S, --revs-file     Use revisions from revs-file instead of calling git-rev-list\\n\"\n-\t\"  -h, --help          This message\";\n+static const char blame_usage[] =\n+\"git-blame [-c] [-l] [-t] [-S <revs-file>] [--] file [commit]\\n\"\n+\"  -c, --compatibility Use the same output mode as git-annotate (Default: off)\\n\"\n+\"  -l, --long          Show long commit SHA1 (Default: off)\\n\"\n+\"  -t, --time          Show raw timestamp (Default: off)\\n\"\n+\"  -S, --revs-file     Use revisions from revs-file instead of calling git-rev-list\\n\"\n+\"  -h, --help          This message\";\n \n static struct commit **blame_lines;\n static int num_blame_lines;\n-static char* blame_contents;\n+static char *blame_contents;\n static int blame_len;\n \n struct util_info {\n@@ -38,9 +39,9 @@ struct util_info {\n \tchar *buf;\n \tunsigned long size;\n \tint num_lines;\n-\tconst char* pathname;\n+\tconst char *pathname;\n \n-\tvoid* topo_data;\n+\tvoid *topo_data;\n };\n \n struct chunk {\n@@ -156,11 +157,10 @@ static int get_blob_sha1_internal(const \n \t\t\t\t  unsigned mode, int stage);\n \n static unsigned char blob_sha1[20];\n-static const char* blame_file;\n+static const char *blame_file;\n static int get_blob_sha1(struct tree *t, const char *pathname,\n \t\t\t unsigned char *sha1)\n {\n-\tint i;\n \tconst char *pathspec[2];\n \tblame_file = pathname;\n \tpathspec[0] = pathname;\n@@ -168,12 +168,7 @@ static int get_blob_sha1(struct tree *t,\n \thashclr(blob_sha1);\n \tread_tree_recursive(t, \"\", 0, 0, pathspec, get_blob_sha1_internal);\n \n-\tfor (i = 0; i < 20; i++) {\n-\t\tif (blob_sha1[i] != 0)\n-\t\t\tbreak;\n-\t}\n-\n-\tif (i == 20)\n+\tif (is_null_sha1(blob_sha1))\n \t\treturn -1;\n \n \thashcpy(sha1, blob_sha1);\n@@ -239,7 +234,8 @@ static void print_map(struct commit *cmi\n \t\tif (i < util->num_lines) {\n \t\t\tnum = util->line_map[i];\n \t\t\tprintf(\"%d\\t\", num);\n-\t\t} else\n+\t\t}\n+\t\telse\n \t\t\tprintf(\"\\t\");\n \n \t\tif (i < util2->num_lines) {\n@@ -247,7 +243,8 @@ static void print_map(struct commit *cmi\n \t\t\tprintf(\"%d\\t\", num2);\n \t\t\tif (num != -1 && num2 != num)\n \t\t\t\tprintf(\"---\");\n-\t\t} else\n+\t\t}\n+\t\telse\n \t\t\tprintf(\"\\t\");\n \n \t\tprintf(\"\\n\");\n@@ -266,12 +263,12 @@ static void fill_line_map(struct commit \n \tint cur_chunk = 0;\n \tint i1, i2;\n \n-\tif (p->num && DEBUG)\n-\t\tprint_patch(p);\n-\n-\tif (DEBUG)\n+\tif (DEBUG) {\n+\t\tif (p->num)\n+\t\t\tprint_patch(p);\n \t\tprintf(\"num lines 1: %d num lines 2: %d\\n\", util->num_lines,\n \t\t       util2->num_lines);\n+\t}\n \n \tfor (i1 = 0, i2 = 0; i1 < util->num_lines; i1++, i2++) {\n \t\tstruct chunk *chunk = NULL;\n@@ -293,7 +290,8 @@ static void fill_line_map(struct commit \n \t\t\t\ti2 += chunk->len2;\n \n \t\t\tcur_chunk++;\n-\t\t} else {\n+\t\t}\n+\t\telse {\n \t\t\tif (i2 >= util2->num_lines)\n \t\t\t\tbreak;\n \n@@ -327,7 +325,7 @@ static int map_line(struct commit *commi\n \treturn info->line_map[line];\n }\n \n-static struct util_info* get_util(struct commit *commit)\n+static struct util_info *get_util(struct commit *commit)\n {\n \tstruct util_info *util = commit->util;\n \n@@ -369,7 +367,7 @@ static void alloc_line_map(struct commit\n \t\tif (util->buf[i] == '\\n')\n \t\t\tutil->num_lines++;\n \t}\n-\tif(util->buf[util->size - 1] != '\\n')\n+\tif (util->buf[util->size - 1] != '\\n')\n \t\tutil->num_lines++;\n \n \tutil->line_map = xmalloc(sizeof(int) * util->num_lines);\n@@ -378,9 +376,9 @@ static void alloc_line_map(struct commit\n \t\tutil->line_map[i] = -1;\n }\n \n-static void init_first_commit(struct commit* commit, const char* filename)\n+static void init_first_commit(struct commit *commit, const char *filename)\n {\n-\tstruct util_info* util = commit->util;\n+\tstruct util_info *util = commit->util;\n \tint i;\n \n \tutil->pathname = filename;\n@@ -395,18 +393,17 @@ static void init_first_commit(struct com\n \t\tutil->line_map[i] = i;\n }\n \n-\n static void process_commits(struct rev_info *rev, const char *path,\n-\t\t\t    struct commit** initial)\n+\t\t\t    struct commit **initial)\n {\n \tint i;\n-\tstruct util_info* util;\n+\tstruct util_info *util;\n \tint lines_left;\n \tint *blame_p;\n \tint *new_lines;\n \tint new_lines_len;\n \n-\tstruct commit* commit = get_revision(rev);\n+\tstruct commit *commit = get_revision(rev);\n \tassert(commit);\n \tinit_first_commit(commit, path);\n \n@@ -442,7 +439,7 @@ static void process_commits(struct rev_i\n \t\t     parents != NULL; parents = parents->next)\n \t\t\tnum_parents++;\n \n-\t\tif(num_parents == 0)\n+\t\tif (num_parents == 0)\n \t\t\t*initial = commit;\n \n \t\tif (fill_util_info(commit))\n@@ -503,13 +500,12 @@ static void process_commits(struct rev_i\n \t} while ((commit = get_revision(rev)) != NULL);\n }\n \n-\n-static int compare_tree_path(struct rev_info* revs,\n-\t\t\t     struct commit* c1, struct commit* c2)\n+static int compare_tree_path(struct rev_info *revs,\n+\t\t\t     struct commit *c1, struct commit *c2)\n {\n \tint ret;\n-\tconst char* paths[2];\n-\tstruct util_info* util = c2->util;\n+\tconst char *paths[2];\n+\tstruct util_info *util = c2->util;\n \tpaths[0] = util->pathname;\n \tpaths[1] = NULL;\n \n@@ -520,12 +516,11 @@ static int compare_tree_path(struct rev_\n \treturn ret;\n }\n \n-\n-static int same_tree_as_empty_path(struct rev_info *revs, struct tree* t1,\n-\t\t\t\t   const char* path)\n+static int same_tree_as_empty_path(struct rev_info *revs, struct tree *t1,\n+\t\t\t\t   const char *path)\n {\n \tint ret;\n-\tconst char* paths[2];\n+\tconst char *paths[2];\n \tpaths[0] = path;\n \tpaths[1] = NULL;\n \n@@ -536,9 +531,9 @@ static int same_tree_as_empty_path(struc\n \treturn ret;\n }\n \n-static const char* find_rename(struct commit* commit, struct commit* parent)\n+static const char *find_rename(struct commit *commit, struct commit *parent)\n {\n-\tstruct util_info* cutil = commit->util;\n+\tstruct util_info *cutil = commit->util;\n \tstruct diff_options diff_opts;\n \tconst char *paths[1];\n \tint i;\n@@ -564,9 +559,11 @@ static const char* find_rename(struct co\n \tfor (i = 0; i < diff_queued_diff.nr; i++) {\n \t\tstruct diff_filepair *p = diff_queued_diff.queue[i];\n \n-\t\tif (p->status == 'R' && !strcmp(p->one->path, cutil->pathname)) {\n+\t\tif (p->status == 'R' &&\n+\t\t    !strcmp(p->one->path, cutil->pathname)) {\n \t\t\tif (DEBUG)\n-\t\t\t\tprintf(\"rename %s -> %s\\n\", p->one->path, p->two->path);\n+\t\t\t\tprintf(\"rename %s -> %s\\n\",\n+\t\t\t\t       p->one->path, p->two->path);\n \t\t\treturn p->two->path;\n \t\t}\n \t}\n@@ -582,7 +579,7 @@ static void simplify_commit(struct rev_i\n \t\treturn;\n \n \tif (!commit->parents) {\n-\t\tstruct util_info* util = commit->util;\n+\t\tstruct util_info *util = commit->util;\n \t\tif (!same_tree_as_empty_path(revs, commit->tree,\n \t\t\t\t\t     util->pathname))\n \t\t\tcommit->object.flags |= TREECHANGE;\n@@ -608,17 +605,17 @@ static void simplify_commit(struct rev_i\n \n \t\tcase REV_TREE_NEW:\n \t\t{\n-\n-\t\t\tstruct util_info* util = commit->util;\n+\t\t\tstruct util_info *util = commit->util;\n \t\t\tif (revs->remove_empty_trees &&\n \t\t\t    same_tree_as_empty_path(revs, p->tree,\n \t\t\t\t\t\t    util->pathname)) {\n-\t\t\t\tconst char* new_name = find_rename(commit, p);\n+\t\t\t\tconst char *new_name = find_rename(commit, p);\n \t\t\t\tif (new_name) {\n-\t\t\t\t\tstruct util_info* putil = get_util(p);\n+\t\t\t\t\tstruct util_info *putil = get_util(p);\n \t\t\t\t\tif (!putil->pathname)\n \t\t\t\t\t\tputil->pathname = xstrdup(new_name);\n-\t\t\t\t} else {\n+\t\t\t\t}\n+\t\t\t\telse {\n \t\t\t\t\t*pp = parent->next;\n \t\t\t\t\tcontinue;\n \t\t\t\t}\n@@ -639,19 +636,18 @@ static void simplify_commit(struct rev_i\n \tcommit->object.flags |= TREECHANGE;\n }\n \n-\n struct commit_info\n {\n-\tchar* author;\n-\tchar* author_mail;\n+\tchar *author;\n+\tchar *author_mail;\n \tunsigned long author_time;\n-\tchar* author_tz;\n+\tchar *author_tz;\n };\n \n-static void get_commit_info(struct commit* commit, struct commit_info* ret)\n+static void get_commit_info(struct commit *commit, struct commit_info *ret)\n {\n \tint len;\n-\tchar* tmp;\n+\tchar *tmp;\n \tstatic char author_buf[1024];\n \n \ttmp = strstr(commit->buffer, \"\\nauthor \") + 8;\n@@ -662,24 +658,24 @@ static void get_commit_info(struct commi\n \ttmp = ret->author;\n \ttmp += len;\n \t*tmp = 0;\n-\twhile(*tmp != ' ')\n+\twhile (*tmp != ' ')\n \t\ttmp--;\n \tret->author_tz = tmp+1;\n \n \t*tmp = 0;\n-\twhile(*tmp != ' ')\n+\twhile (*tmp != ' ')\n \t\ttmp--;\n \tret->author_time = strtoul(tmp, NULL, 10);\n \n \t*tmp = 0;\n-\twhile(*tmp != ' ')\n+\twhile (*tmp != ' ')\n \t\ttmp--;\n \tret->author_mail = tmp + 1;\n \n \t*tmp = 0;\n }\n \n-static const char* format_time(unsigned long time, const char* tz_str,\n+static const char *format_time(unsigned long time, const char *tz_str,\n \t\t\t       int show_raw_time)\n {\n \tstatic char time_buf[128];\n@@ -704,15 +700,15 @@ static const char* format_time(unsigned \n \treturn time_buf;\n }\n \n-static void topo_setter(struct commit* c, void* data)\n+static void topo_setter(struct commit *c, void *data)\n {\n-\tstruct util_info* util = c->util;\n+\tstruct util_info *util = c->util;\n \tutil->topo_data = data;\n }\n \n-static void* topo_getter(struct commit* c)\n+static void *topo_getter(struct commit *c)\n {\n-\tstruct util_info* util = c->util;\n+\tstruct util_info *util = c->util;\n \treturn util->topo_data;\n }\n \n@@ -747,9 +743,9 @@ int main(int argc, const char **argv)\n \tint compatibility = 0;\n \tint show_raw_time = 0;\n \tint options = 1;\n-\tstruct commit* start_commit;\n+\tstruct commit *start_commit;\n \n-\tconst char* args[10];\n+\tconst char *args[10];\n \tstruct rev_info rev;\n \n \tstruct commit_info ci;\n@@ -758,27 +754,30 @@ int main(int argc, const char **argv)\n \tint longest_file, longest_author;\n \tint found_rename;\n \n-\tconst char* prefix = setup_git_directory();\n+\tconst char *prefix = setup_git_directory();\n \tgit_config(git_default_config);\n \n-\tfor(i = 1; i < argc; i++) {\n-\t\tif(options) {\n-\t\t\tif(!strcmp(argv[i], \"-h\") ||\n+\tfor (i = 1; i < argc; i++) {\n+\t\tif (options) {\n+\t\t\tif (!strcmp(argv[i], \"-h\") ||\n \t\t\t   !strcmp(argv[i], \"--help\"))\n \t\t\t\tusage(blame_usage);\n-\t\t\telse if(!strcmp(argv[i], \"-l\") ||\n-\t\t\t\t!strcmp(argv[i], \"--long\")) {\n+\t\t\tif (!strcmp(argv[i], \"-l\") ||\n+\t\t\t    !strcmp(argv[i], \"--long\")) {\n \t\t\t\tsha1_len = 40;\n \t\t\t\tcontinue;\n-\t\t\t} else if(!strcmp(argv[i], \"-c\") ||\n-\t\t\t\t  !strcmp(argv[i], \"--compatibility\")) {\n+\t\t\t}\n+\t\t\tif (!strcmp(argv[i], \"-c\") ||\n+\t\t\t    !strcmp(argv[i], \"--compatibility\")) {\n \t\t\t\tcompatibility = 1;\n \t\t\t\tcontinue;\n-\t\t\t} else if(!strcmp(argv[i], \"-t\") ||\n-\t\t\t\t  !strcmp(argv[i], \"--time\")) {\n+\t\t\t}\n+\t\t\tif (!strcmp(argv[i], \"-t\") ||\n+\t\t\t    !strcmp(argv[i], \"--time\")) {\n \t\t\t\tshow_raw_time = 1;\n \t\t\t\tcontinue;\n-\t\t\t} else if(!strcmp(argv[i], \"-S\")) {\n+\t\t\t}\n+\t\t\tif (!strcmp(argv[i], \"-S\")) {\n \t\t\t\tif (i + 1 < argc &&\n \t\t\t\t    !read_ancestry(argv[i + 1], &sha1_p)) {\n \t\t\t\t\tcompatibility = 1;\n@@ -786,33 +785,34 @@ int main(int argc, const char **argv)\n \t\t\t\t\tcontinue;\n \t\t\t\t}\n \t\t\t\tusage(blame_usage);\n-\t\t\t} else if(!strcmp(argv[i], \"--\")) {\n+\t\t\t}\n+\t\t\tif (!strcmp(argv[i], \"--\")) {\n \t\t\t\toptions = 0;\n \t\t\t\tcontinue;\n-\t\t\t} else if(argv[i][0] == '-')\n+\t\t\t}\n+\t\t\tif (argv[i][0] == '-')\n \t\t\t\tusage(blame_usage);\n-\t\t\telse\n-\t\t\t\toptions = 0;\n+\t\t\toptions = 0;\n \t\t}\n \n-\t\tif(!options) {\n-\t\t\tif(!filename)\n+\t\tif (!options) {\n+\t\t\tif (!filename)\n \t\t\t\tfilename = argv[i];\n-\t\t\telse if(!commit)\n+\t\t\telse if (!commit)\n \t\t\t\tcommit = argv[i];\n \t\t\telse\n \t\t\t\tusage(blame_usage);\n \t\t}\n \t}\n \n-\tif(!filename)\n+\tif (!filename)\n \t\tusage(blame_usage);\n \tif (commit && sha1_p)\n \t\tusage(blame_usage);\n-\telse if(!commit)\n+\telse if (!commit)\n \t\tcommit = \"HEAD\";\n \n-\tif(prefix)\n+\tif (prefix)\n \t\tsprintf(filename_buf, \"%s%s\", prefix, filename);\n \telse\n \t\tstrcpy(filename_buf, filename);\n@@ -830,7 +830,6 @@ int main(int argc, const char **argv)\n \t\treturn 1;\n \t}\n \n-\n \tinit_revisions(&rev, setup_git_directory());\n \trev.remove_empty_trees = 1;\n \trev.topo_order = 1;\n@@ -857,7 +856,7 @@ int main(int argc, const char **argv)\n \tfound_rename = 0;\n \tfor (i = 0; i < num_blame_lines; i++) {\n \t\tstruct commit *c = blame_lines[i];\n-\t\tstruct util_info* u;\n+\t\tstruct util_info *u;\n \t\tif (!c)\n \t\t\tc = initial;\n \t\tu = c->util;\n@@ -873,20 +872,20 @@ int main(int argc, const char **argv)\n \n \tfor (i = 0; i < num_blame_lines; i++) {\n \t\tstruct commit *c = blame_lines[i];\n-\t\tstruct util_info* u;\n-\n+\t\tstruct util_info *u;\n \t\tif (!c)\n \t\t\tc = initial;\n-\n \t\tu = c->util;\n+\n \t\tget_commit_info(c, &ci);\n \t\tfwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);\n-\t\tif(compatibility) {\n+\t\tif (compatibility) {\n \t\t\tprintf(\"\\t(%10s\\t%10s\\t%d)\", ci.author,\n \t\t\t       format_time(ci.author_time, ci.author_tz,\n \t\t\t\t\t   show_raw_time),\n \t\t\t       i+1);\n-\t\t} else {\n+\t\t}\n+\t\telse {\n \t\t\tif (found_rename)\n \t\t\t\tprintf(\" %-*.*s\", longest_file, longest_file,\n \t\t\t\t       u->pathname);\n@@ -897,13 +896,14 @@ int main(int argc, const char **argv)\n \t\t\t       max_digits, i+1);\n \t\t}\n \n-\t\tif(i == num_blame_lines - 1) {\n+\t\tif (i == num_blame_lines - 1) {\n \t\t\tfwrite(buf, blame_len - (buf - blame_contents),\n \t\t\t       1, stdout);\n-\t\t\tif(blame_contents[blame_len-1] != '\\n')\n+\t\t\tif (blame_contents[blame_len-1] != '\\n')\n \t\t\t\tputc('\\n', stdout);\n-\t\t} else {\n-\t\t\tchar* next_buf = strchr(buf, '\\n') + 1;\n+\t\t}\n+\t\telse {\n+\t\t\tchar *next_buf = strchr(buf, '\\n') + 1;\n \t\t\tfwrite(buf, next_buf - buf, 1, stdout);\n \t\t\tbuf = next_buf;\n \t\t}\n-- \n1.4.2.3.g866f3\n"}]}