mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer

Browse Source 
Many call sites use strbuf_init(&foo, 0) to initialize local
strbuf variable "foo" which has not been accessed since its
declaration. These can be replaced with a static initialization
using the STRBUF_INIT macro which is just as readable, saves a
function call, and takes up fewer lines.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Brandon Casey
2008-10-09 14:12:12 -05:00
committed by Shawn O. Pearce
parent 7e7abea96b
commit f285a2d7ed
46 changed files with 91 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
builtin-merge.c
View File

@ -226,7 +226,7 @@ static void reset_hard(unsigned const char *sha1, int verbose)
static void restore_state(void)
{
struct strbuf sb;
struct strbuf sb = STRBUF_INIT;
const char *args[] = { "stash", "apply", NULL, NULL };
if (is_null_sha1(stash))
@ -234,7 +234,6 @@ static void restore_state(void)
reset_hard(head, 1);
strbuf_init(&sb, 0);
args[2] = sha1_to_hex(stash);
/*
@ -258,7 +257,7 @@ static void squash_message(void)
{
struct rev_info rev;
struct commit *commit;
struct strbuf out;
struct strbuf out = STRBUF_INIT;
struct commit_list *j;
int fd;
@ -282,7 +281,6 @@ static void squash_message(void)
if (prepare_revision_walk(&rev))
die("revision walk setup failed");
strbuf_init(&out, 0);
strbuf_addstr(&out, "Squashed commit of the following:\n");
while ((commit = get_revision(&rev)) != NULL) {
strbuf_addch(&out, '\n');
@ -327,9 +325,8 @@ static int run_hook(const char *name)
static void finish(const unsigned char *new_head, const char *msg)
{
struct strbuf reflog_message;
struct strbuf reflog_message = STRBUF_INIT;
strbuf_init(&reflog_message, 0);
if (!msg)
strbuf_addstr(&reflog_message, getenv("GIT_REFLOG_ACTION"));
else {
@ -380,7 +377,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
{
struct object *remote_head;
unsigned char branch_head[20], buf_sha[20];
struct strbuf buf;
struct strbuf buf = STRBUF_INIT;
const char *ptr;
int len, early;
@ -389,7 +386,6 @@ static void merge_name(const char *remote, struct strbuf *msg)
if (!remote_head)
die("'%s' does not point to a commit", remote);
strbuf_init(&buf, 0);
strbuf_addstr(&buf, "refs/heads/");
strbuf_addstr(&buf, remote);
resolve_ref(buf.buf, branch_head, 0, 0);
@ -444,10 +440,9 @@ static void merge_name(const char *remote, struct strbuf *msg)
if (!strcmp(remote, "FETCH_HEAD") &&
!access(git_path("FETCH_HEAD"), R_OK)) {
FILE *fp;
struct strbuf line;
struct strbuf line = STRBUF_INIT;
char *ptr;
strbuf_init(&line, 0);
fp = fopen(git_path("FETCH_HEAD"), "r");
if (!fp)
die("could not open %s for reading: %s",
@ -545,7 +540,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
const char **args;
int i = 0, ret;
struct commit_list *j;
struct strbuf buf;
struct strbuf buf = STRBUF_INIT;
int index_fd;
struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
@ -592,7 +587,6 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
} else {
args = xmalloc((4 + commit_list_count(common) +
commit_list_count(remoteheads)) * sizeof(char *));
strbuf_init(&buf, 0);
strbuf_addf(&buf, "merge-%s", strategy);
args[i++] = buf.buf;
for (j = common; j; j = j->next)
@ -847,7 +841,7 @@ static int evaluate_result(void)
int cmd_merge(int argc, const char **argv, const char *prefix)
{
unsigned char result_tree[20];
struct strbuf buf;
struct strbuf buf = STRBUF_INIT;
const char *head_arg;
int flag, head_invalid = 0, i;
int best_cnt = -1, merge_was_ok = 0, automerge_was_ok = 0;
@ -896,7 +890,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* Traditional format never would have "-m" so it is an
* additional safety measure to check for it.
*/
strbuf_init(&buf, 0);
if (!have_message && is_old_style_invocation(argc, argv)) {
strbuf_addstr(&merge_msg, argv[0]);
@ -926,7 +919,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
reset_hard(remote_head->sha1, 0);
return 0;
} else {
struct strbuf msg;
struct strbuf msg = STRBUF_INIT;
/* We are invoked directly as the first-class UI. */
head_arg = "HEAD";
@ -939,7 +932,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
* codepath so we discard the error in this
* loop.
*/
strbuf_init(&msg, 0);
for (i = 0; i < argc; i++)
merge_name(argv[i], &msg);
fmt_merge_msg(option_log, &msg, &merge_msg);
@ -1014,7 +1006,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
!common->next &&
!hashcmp(common->item->object.sha1, head)) {
/* Again the most common case of merging one remote. */
struct strbuf msg;
struct strbuf msg = STRBUF_INIT;
struct object *o;
char hex[41];
@ -1024,7 +1016,6 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
hex,
find_unique_abbrev(remoteheads->item->object.sha1,
DEFAULT_ABBREV));
strbuf_init(&msg, 0);
strbuf_addstr(&msg, "Fast forward");
if (have_message)
strbuf_addstr(&msg,