diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2008-10-09 14:12:12 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-12 12:36:19 -0700 |
| commit | f285a2d7ed6548666989406de8f0e7233eb84368 (patch) | |
| tree | 2e422bd9ceeeb432ca03b61f91165790f0e37146 /builtin-checkout.c | |
| parent | 7e7abea96b8140c592a46293f5e33aae0683c7ac (diff) | |
| download | git-f285a2d7ed6548666989406de8f0e7233eb84368.tar.gz git-f285a2d7ed6548666989406de8f0e7233eb84368.tar.xz | |
Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer
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>
Diffstat (limited to 'builtin-checkout.c')
| -rw-r--r-- | builtin-checkout.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c index 3762f71aa..ad04a184a 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -310,8 +310,7 @@ static void show_local_changes(struct object *head) static void describe_detached_head(char *msg, struct commit *commit) { - struct strbuf sb; - strbuf_init(&sb, 0); + struct strbuf sb = STRBUF_INIT; parse_commit(commit); pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, 0, NULL, NULL, 0, 0); fprintf(stderr, "%s %s... %s\n", msg, @@ -360,8 +359,7 @@ struct branch_info { static void setup_branch_path(struct branch_info *branch) { - struct strbuf buf; - strbuf_init(&buf, 0); + struct strbuf buf = STRBUF_INIT; strbuf_addstr(&buf, "refs/heads/"); strbuf_addstr(&buf, branch->name); branch->path = strbuf_detach(&buf, NULL); @@ -484,7 +482,7 @@ static void update_refs_for_switch(struct checkout_opts *opts, struct branch_info *old, struct branch_info *new) { - struct strbuf msg; + struct strbuf msg = STRBUF_INIT; const char *old_desc; if (opts->new_branch) { create_branch(old->name, opts->new_branch, new->name, 0, @@ -493,7 +491,6 @@ static void update_refs_for_switch(struct checkout_opts *opts, setup_branch_path(new); } - strbuf_init(&msg, 0); old_desc = old->name; if (!old_desc) old_desc = sha1_to_hex(old->commit->object.sha1); @@ -738,8 +735,7 @@ no_reference: } if (opts.new_branch) { - struct strbuf buf; - strbuf_init(&buf, 0); + struct strbuf buf = STRBUF_INIT; strbuf_addstr(&buf, "refs/heads/"); strbuf_addstr(&buf, opts.new_branch); if (!get_sha1(buf.buf, rev)) |