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 | |
| parent | f0ede8435ab161b3aba3e5e306239d6bd74dd9b8 (diff) | |
| parent | ab1900a36ef7fcfe872ff9d0803f9442e356c2f0 (diff) | |
| download | git-35726681d5fd6bde44a18b4aec3cf04258d0b44e.tar.gz git-35726681d5fd6bde44a18b4aec3cf04258d0b44e.tar.xz | |
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')
| -rw-r--r-- | builtin/fast-export.c | 4 | ||||
| -rw-r--r-- | builtin/index-pack.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 9836e6b7c..08fed989a 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -25,7 +25,7 @@ static const char *fast_export_usage[] = { static int progress; static enum { ABORT, VERBATIM, WARN, STRIP } signed_tag_mode = ABORT; -static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ABORT; +static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ERROR; static int fake_missing_tagger; static int use_done_feature; static int no_data; @@ -51,7 +51,7 @@ static int parse_opt_tag_of_filtered_mode(const struct option *opt, const char *arg, int unset) { if (unset || !strcmp(arg, "abort")) - tag_of_filtered_mode = ABORT; + tag_of_filtered_mode = ERROR; else if (!strcmp(arg, "drop")) tag_of_filtered_mode = DROP; else if (!strcmp(arg, "rewrite")) diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 98025da76..af7dc37a4 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) |