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 /merge-recursive.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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 6bc3eac85..245232a40 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -498,8 +498,7 @@ static void update_file_flags(struct merge_options *o, if (type != OBJ_BLOB) die("blob expected for %s '%s'", sha1_to_hex(sha), path); if (S_ISREG(mode)) { - struct strbuf strbuf; - strbuf_init(&strbuf, 0); + struct strbuf strbuf = STRBUF_INIT; if (convert_to_working_tree(path, buf, size, &strbuf)) { free(buf); size = strbuf.len; |