wrapper: 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>

diff --git a/git-compat-util.h b/git-compat-util.h
index 68b2ad531ea6f9cf1127a0e5986c523fd86b0967..07e383257b4985f7400f167d683a5fb692237d93 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -826,8 +826,8 @@ extern ssize_t xpread(int fd, void *buf, size_t len, off_t offset);
 extern int xdup(int fd);
 extern FILE *xfopen(const char *path, const char *mode);
 extern FILE *xfdopen(int fd, const char *mode);
 extern int xdup(int fd);
 extern FILE *xfopen(const char *path, const char *mode);
 extern FILE *xfdopen(int fd, const char *mode);

-extern int xmkstemp(char *template);
-extern int xmkstemp_mode(char *template, int mode);
+extern int xmkstemp(char *temp_filename);
+extern int xmkstemp_mode(char *temp_filename, int mode);

 extern char *xgetcwd(void);
 extern FILE *fopen_for_writing(const char *path);
 extern FILE *fopen_or_warn(const char *path, const char *mode);
 extern char *xgetcwd(void);
 extern FILE *fopen_for_writing(const char *path);
 extern FILE *fopen_or_warn(const char *path, const char *mode);

diff --git a/wrapper.c b/wrapper.c
index d20356a776bc63d4a94e4b421582433fb915087a..1fd5e33ea8f5c8cb4e6720b0bec74acf09232e3c 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -445,21 +445,21 @@ FILE *fopen_or_warn(const char *path, const char *mode)
        return NULL;
 }
 
        return NULL;
 }
 

-int xmkstemp(char *template)
+int xmkstemp(char *filename_template)

 {
        int fd;
        char origtemplate[PATH_MAX];
 {
        int fd;
        char origtemplate[PATH_MAX];

-       strlcpy(origtemplate, template, sizeof(origtemplate));
+       strlcpy(origtemplate, filename_template, sizeof(origtemplate));

 
 

-       fd = mkstemp(template);
+       fd = mkstemp(filename_template);

        if (fd < 0) {
                int saved_errno = errno;
                const char *nonrelative_template;
 
        if (fd < 0) {
                int saved_errno = errno;
                const char *nonrelative_template;
 

-               if (strlen(template) != strlen(origtemplate))
-                       template = origtemplate;
+               if (strlen(filename_template) != strlen(origtemplate))
+                       filename_template = origtemplate;

 
 

-               nonrelative_template = absolute_path(template);
+               nonrelative_template = absolute_path(filename_template);

                errno = saved_errno;
                die_errno("Unable to create temporary file '%s'",
                        nonrelative_template);
                errno = saved_errno;
                die_errno("Unable to create temporary file '%s'",
                        nonrelative_template);


@@ -481,7 +481,7 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
        static const int num_letters = 62;
        uint64_t value;
        struct timeval tv;
        static const int num_letters = 62;
        uint64_t value;
        struct timeval tv;

-       char *template;
+       char *filename_template;

        size_t len;
        int fd, count;
 
        size_t len;
        int fd, count;
 


@@ -503,16 +503,16 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
         */
        gettimeofday(&tv, NULL);
        value = ((size_t)(tv.tv_usec << 16)) ^ tv.tv_sec ^ getpid();
         */
        gettimeofday(&tv, NULL);
        value = ((size_t)(tv.tv_usec << 16)) ^ tv.tv_sec ^ getpid();

-       template = &pattern[len - 6 - suffix_len];
+       filename_template = &pattern[len - 6 - suffix_len];

        for (count = 0; count < TMP_MAX; ++count) {
                uint64_t v = value;
                /* Fill in the random bits. */
        for (count = 0; count < TMP_MAX; ++count) {
                uint64_t v = value;
                /* Fill in the random bits. */

-               template[0] = letters[v % num_letters]; v /= num_letters;
-               template[1] = letters[v % num_letters]; v /= num_letters;
-               template[2] = letters[v % num_letters]; v /= num_letters;
-               template[3] = letters[v % num_letters]; v /= num_letters;
-               template[4] = letters[v % num_letters]; v /= num_letters;
-               template[5] = letters[v % num_letters]; v /= num_letters;
+               filename_template[0] = letters[v % num_letters]; v /= num_letters;
+               filename_template[1] = letters[v % num_letters]; v /= num_letters;
+               filename_template[2] = letters[v % num_letters]; v /= num_letters;
+               filename_template[3] = letters[v % num_letters]; v /= num_letters;
+               filename_template[4] = letters[v % num_letters]; v /= num_letters;
+               filename_template[5] = letters[v % num_letters]; v /= num_letters;

 
                fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode);
                if (fd >= 0)
 
                fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode);
                if (fd >= 0)


@@ -541,21 +541,21 @@ int git_mkstemp_mode(char *pattern, int mode)
        return git_mkstemps_mode(pattern, 0, mode);
 }
 
        return git_mkstemps_mode(pattern, 0, mode);
 }
 

-int xmkstemp_mode(char *template, int mode)
+int xmkstemp_mode(char *filename_template, int mode)

 {
        int fd;
        char origtemplate[PATH_MAX];
 {
        int fd;
        char origtemplate[PATH_MAX];

-       strlcpy(origtemplate, template, sizeof(origtemplate));
+       strlcpy(origtemplate, filename_template, sizeof(origtemplate));

 
 

-       fd = git_mkstemp_mode(template, mode);
+       fd = git_mkstemp_mode(filename_template, mode);

        if (fd < 0) {
                int saved_errno = errno;
                const char *nonrelative_template;
 
        if (fd < 0) {
                int saved_errno = errno;
                const char *nonrelative_template;
 

-               if (!template[0])
-                       template = origtemplate;
+               if (!filename_template[0])
+                       filename_template = origtemplate;

 
 

-               nonrelative_template = absolute_path(template);
+               nonrelative_template = absolute_path(filename_template);

                errno = saved_errno;
                die_errno("Unable to create temporary file '%s'",
                        nonrelative_template);
                errno = saved_errno;
                die_errno("Unable to create temporary file '%s'",
                        nonrelative_template);