diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-30 21:40:20 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-30 21:40:20 +0200 |
| commit | 2f60073dc58cc598a2193ee2cfecc717073f2ccc (patch) | |
| tree | c56f57d31dd07f9fca90cc9f0c76663c45e3343c | |
| parent | cb58fb24f5d90878a6280a3c6e5d93bf92247cf1 (diff) | |
| parent | eb29292aed7cd264162809678ab9cf31bcc20ac4 (diff) | |
| download | libgit2-2f60073dc58cc598a2193ee2cfecc717073f2ccc.tar.gz | |
Merge pull request #3273 from ethomson/warnings3
More warnings
| -rw-r--r-- | src/diff_print.c | 2 | ||||
| -rw-r--r-- | src/transports/winhttp.c | 1 | ||||
| -rw-r--r-- | src/unix/posix.h | 1 | ||||
| -rw-r--r-- | tests/checkout/conflict.c | 5 | ||||
| -rw-r--r-- | tests/index/addall.c | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/src/diff_print.c b/src/diff_print.c index 546488c2f..d406a441a 100644 --- a/src/diff_print.c +++ b/src/diff_print.c @@ -336,7 +336,7 @@ static int format_binary( "delta" : "literal"; const char *scan, *end; - git_buf_printf(pi->buf, "%s %lu\n", typename, inflatedlen); + git_buf_printf(pi->buf, "%s %" PRIuZ "\n", typename, inflatedlen); pi->line.num_lines++; for (scan = data, end = data + datalen; scan < end; ) { diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c index f84e2ae9f..da047d690 100644 --- a/src/transports/winhttp.c +++ b/src/transports/winhttp.c @@ -1096,7 +1096,6 @@ static int winhttp_stream_write_chunked( size_t len) { winhttp_stream *s = (winhttp_stream *)stream; - winhttp_subtransport *t = OWNING_SUBTRANSPORT(s); int error; if (!s->request && winhttp_stream_connect(s) < 0) diff --git a/src/unix/posix.h b/src/unix/posix.h index c852936be..777350990 100644 --- a/src/unix/posix.h +++ b/src/unix/posix.h @@ -11,6 +11,7 @@ #include <dirent.h> #include <sys/param.h> #include <sys/time.h> +#include <sys/stat.h> typedef int GIT_SOCKET; #define INVALID_SOCKET -1 diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c index 006dc6522..dd2dd3131 100644 --- a/tests/checkout/conflict.c +++ b/tests/checkout/conflict.c @@ -161,7 +161,10 @@ static void ensure_workdir_oid(const char *path, const char *oid_str) static void ensure_workdir_mode(const char *path, int mode) { -#ifndef GIT_WIN32 +#ifdef GIT_WIN32 + GIT_UNUSED(path); + GIT_UNUSED(mode); +#else git_buf fullpath = GIT_BUF_INIT; struct stat st; diff --git a/tests/index/addall.c b/tests/index/addall.c index f344cc6ae..9ddb27f95 100644 --- a/tests/index/addall.c +++ b/tests/index/addall.c @@ -443,4 +443,4 @@ void test_index_addall__removes_deleted_conflicted_files(void) git_annotated_commit_free(annotated); git_reference_free(ref); git_index_free(index); -}
\ No newline at end of file +} |