diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 15:30:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 15:30:33 -0800 |
| commit | 35726681d5fd6bde44a18b4aec3cf04258d0b44e (patch) | |
| tree | 217b0c1e4d7ab8c160451be5ad42711f46602bfc /builtin/index-pack.c | |
| parent | Merge branch 'tr/doc-sh-setup' (diff) | |
| parent | Appease Sun Studio by renaming "tmpfile" (diff) | |
| download | git-35726681d5fd6bde44a18b4aec3cf04258d0b44e.tar.gz git-35726681d5fd6bde44a18b4aec3cf04258d0b44e.zip | |
Merge branch 'ab/sun-studio-portability'
* ab/sun-studio-portability:
Appease Sun Studio by renaming "tmpfile"
Fix a bitwise negation assignment issue spotted by Sun Studio
Fix an enum assignment issue spotted by Sun Studio
Diffstat (limited to 'builtin/index-pack.c')
| -rw-r--r-- | builtin/index-pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 98025da767..af7dc37a44 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -172,10 +172,10 @@ static const char *open_pack_file(const char *pack_name) if (from_stdin) { input_fd = 0; if (!pack_name) { - static char tmpfile[PATH_MAX]; - output_fd = odb_mkstemp(tmpfile, sizeof(tmpfile), + static char tmp_file[PATH_MAX]; + output_fd = odb_mkstemp(tmp_file, sizeof(tmp_file), "pack/tmp_pack_XXXXXX"); - pack_name = xstrdup(tmpfile); + pack_name = xstrdup(tmp_file); } else output_fd = open(pack_name, O_CREAT|O_EXCL|O_RDWR, 0600); if (output_fd < 0) |
