trailer: rename 'template' variables
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
Feb 14, 2018 at 10:59 UTC
31c2c7a0ce2b0bd788d1cf7e1f0d14fad8132a7f
1 file changed
+5
-5
trailer.c
+5
-5
@@ -1000,7 +1000,7 @@ static struct tempfile *trailers_tempfile;
1000
static FILE *create_in_place_tempfile(const char *file)
1001
{
1002
struct stat st;
1003
- struct strbuf template = STRBUF_INIT;
1003
+ struct strbuf filename_template = STRBUF_INIT;
1004
const char *tail;
1005
FILE *outfile;
1006
@@ -1014,11 +1014,11 @@ static FILE *create_in_place_tempfile(const char *file)
1014
/* Create temporary file in the same directory as the original */
1015
tail = strrchr(file, '/');
1016
if (tail != NULL)
1017
- strbuf_add(&template, file, tail - file + 1);
1018
- strbuf_addstr(&template, "git-interpret-trailers-XXXXXX");
1017
+ strbuf_add(&filename_template, file, tail - file + 1);
1018
+ strbuf_addstr(&filename_template, "git-interpret-trailers-XXXXXX");
1019
1020
- trailers_tempfile = xmks_tempfile_m(template.buf, st.st_mode);
1021
- strbuf_release(&template);
1020
+ trailers_tempfile = xmks_tempfile_m(filename_template.buf, st.st_mode);
1021
+ strbuf_release(&filename_template);
1022
outfile = fdopen_tempfile(trailers_tempfile, "w");
1023
if (!outfile)
1024
die_errno(_("could not open temporary file"));