[PATCH v2 32/37] diff: rename 'template' variables
- From
- Brandon Williams <bmwill@google.com>
- Date
- Feb 14, 2018, 18:59 UTC
- Message-ID
- <20180214185959.221906-33-bmwill@google.com>
- In-Reply-To
- <20180214185959.221906-1-bmwill@google.com>
Rename C++ keyword in order to bring the codebase closer to being able to be compiled with a C++ compiler.
Signed-off-by: Brandon Williams <bmwill@google.com> --- diff.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c index 2de9c5ed2..5e46502cd 100644 --- a/diff.c +++ b/diff.c @@ -3660,15 +3660,15 @@ static void prep_temp_blob(const char *path, struct diff_tempfile *temp, int mode) { struct strbuf buf = STRBUF_INIT; - struct strbuf template = STRBUF_INIT; + struct strbuf tempfile = STRBUF_INIT; char *path_dup = xstrdup(path); const char *base = basename(path_dup); /* Generate "XXXXXX_basename.ext" */ - strbuf_addstr(&template, "XXXXXX_"); - strbuf_addstr(&template, base); + strbuf_addstr(&tempfile, "XXXXXX_"); + strbuf_addstr(&tempfile, base); - temp->tempfile = mks_tempfile_ts(template.buf, strlen(base) + 1); + temp->tempfile = mks_tempfile_ts(tempfile.buf, strlen(base) + 1); if (!temp->tempfile) die_errno("unable to create temp-file"); if (convert_to_working_tree(path, @@ -3683,7 +3683,7 @@ static void prep_temp_blob(const char *path, struct diff_tempfile *temp, oid_to_hex_r(temp->hex, oid); xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode); strbuf_release(&buf); - strbuf_release(&template); + strbuf_release(&tempfile); free(path_dup); }
-- 2.16.1.291.g4437f3f132-goog