microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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>
This commit is contained in:
Brandon Williams 2018-02-14 10:59:56 -08:00 коммит произвёл Junio C Hamano
Родитель 38f3f09421
Коммит eb78e23f22
2 изменённых файлов: 22 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
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 int xdup(int fd);
extern FILE *xfopen(const char *path, const char *mode); extern FILE *xfopen(const char *path, const char *mode);
extern FILE *xfdopen(int fd, const char *mode); extern FILE *xfdopen(int fd, const char *mode);
extern int xmkstemp(char *template); extern int xmkstemp(char *temp_filename);
extern int xmkstemp_mode(char *template, int mode); extern int xmkstemp_mode(char *temp_filename, int mode);
extern char *xgetcwd(void); extern char *xgetcwd(void);
extern FILE *fopen_for_writing(const char *path); extern FILE *fopen_for_writing(const char *path);
extern FILE *fopen_or_warn(const char *path, const char *mode); extern FILE *fopen_or_warn(const char *path, const char *mode);

40
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; int fd;
char origtemplate[PATH_MAX]; 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) { if (fd < 0) {
int saved_errno = errno; int saved_errno = errno;
const char *nonrelative_template; const char *nonrelative_template;
if (strlen(template) != strlen(origtemplate)) if (strlen(filename_template) != strlen(origtemplate))
template = origtemplate; filename_template = origtemplate;
nonrelative_template = absolute_path(template); nonrelative_template = absolute_path(filename_template);
errno = saved_errno; errno = saved_errno;
die_errno("Unable to create temporary file '%s'", die_errno("Unable to create temporary file '%s'",
nonrelative_template); nonrelative_template);
@ -481,7 +481,7 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
static const int num_letters = 62; static const int num_letters = 62;
uint64_t value; uint64_t value;
struct timeval tv; struct timeval tv;
char *template; char *filename_template;
size_t len; size_t len;
int fd, count; int fd, count;
@ -503,16 +503,16 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
*/ */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
value = ((size_t)(tv.tv_usec << 16)) ^ tv.tv_sec ^ getpid(); 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) { for (count = 0; count < TMP_MAX; ++count) {
uint64_t v = value; uint64_t v = value;
/* Fill in the random bits. */ /* Fill in the random bits. */
template[0] = letters[v % num_letters]; v /= num_letters; filename_template[0] = letters[v % num_letters]; v /= num_letters;
template[1] = letters[v % num_letters]; v /= num_letters; filename_template[1] = letters[v % num_letters]; v /= num_letters;
template[2] = letters[v % num_letters]; v /= num_letters; filename_template[2] = letters[v % num_letters]; v /= num_letters;
template[3] = letters[v % num_letters]; v /= num_letters; filename_template[3] = letters[v % num_letters]; v /= num_letters;
template[4] = letters[v % num_letters]; v /= num_letters; filename_template[4] = letters[v % num_letters]; v /= num_letters;
template[5] = 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); fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode);
if (fd >= 0) 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; int fd;
char origtemplate[PATH_MAX]; 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) { if (fd < 0) {
int saved_errno = errno; int saved_errno = errno;
const char *nonrelative_template; const char *nonrelative_template;
if (!template[0]) if (!filename_template[0])
template = origtemplate; filename_template = origtemplate;
nonrelative_template = absolute_path(template); nonrelative_template = absolute_path(filename_template);
errno = saved_errno; errno = saved_errno;
die_errno("Unable to create temporary file '%s'", die_errno("Unable to create temporary file '%s'",
nonrelative_template); nonrelative_template);