Commit a63b5fca authored by Brandon Williams's avatar Brandon Williams Committed by Junio C Hamano

environment: 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: default avatarBrandon Williams <>
Signed-off-by: default avatarJunio C Hamano <>
parent fa0fccae
......@@ -1673,7 +1673,7 @@ struct pack_entry {
* usual "XXXXXX" trailer, and the resulting filename is written into the
* "template" buffer. Returns the open descriptor.
extern int odb_mkstemp(struct strbuf *template, const char *pattern);
extern int odb_mkstemp(struct strbuf *temp_filename, const char *pattern);
* Create a pack .keep file named "name" (which should generally be the output
......@@ -247,7 +247,7 @@ char *get_object_directory(void)
return the_repository->objectdir;
int odb_mkstemp(struct strbuf *template, const char *pattern)
int odb_mkstemp(struct strbuf *temp_filename, const char *pattern)
int fd;
......@@ -255,16 +255,16 @@ int odb_mkstemp(struct strbuf *template, const char *pattern)
* restrictive except to remove write permission.
int mode = 0444;
git_path_buf(template, "objects/%s", pattern);
fd = git_mkstemp_mode(template->buf, mode);
git_path_buf(temp_filename, "objects/%s", pattern);
fd = git_mkstemp_mode(temp_filename->buf, mode);
if (0 <= fd)
return fd;
/* slow path */
/* some mkstemp implementations erase template on failure */
git_path_buf(template, "objects/%s", pattern);
return xmkstemp_mode(template->buf, mode);
/* some mkstemp implementations erase temp_filename on failure */
git_path_buf(temp_filename, "objects/%s", pattern);
return xmkstemp_mode(temp_filename->buf, mode);
int odb_pack_keep(const char *name)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment