Merge pull request libgit2#1933 from libgit2/vmg/gcc-warnings

arrbee · arrbee · commit 948f00b4e79b · 2013-11-01T09:38:03.000-07:00
Warnings for Windows x64 (MSVC) and GCC on Linux
diff --git a/src/array.h b/src/array.h
@@ -57,9 +57,9 @@ GIT_INLINE(void *) git_array_grow(void *_a, size_t item_size)
 }
 
 #define git_array_alloc(a) \
-	((a).size >= (a).asize) ? \
+	(((a).size >= (a).asize) ? \
 	git_array_grow(&(a), sizeof(*(a).ptr)) : \
-	((a).ptr ? &(a).ptr[(a).size++] : NULL)
+	((a).ptr ? &(a).ptr[(a).size++] : NULL))
 
 #define git_array_last(a) ((a).size ? &(a).ptr[(a).size - 1] : NULL)
 
diff --git a/src/checkout.c b/src/checkout.c
@@ -1694,7 +1694,6 @@ static int checkout_write_merge(
 
 static int checkout_create_conflicts(checkout_data *data)
 {
-	git_vector conflicts = GIT_VECTOR_INIT;
 	checkout_conflictdata *conflict;
 	size_t i;
 	int error = 0;
diff --git a/src/indexer.c b/src/indexer.c
@@ -660,7 +660,7 @@ static int inject_object(git_indexer *idx, git_oid *id)
 	/* And then the compressed object */
 	git_filebuf_write(&idx->pack_file, buf.ptr, buf.size);
 	idx->pack->mwf.size += buf.size;
-	entry->crc = htonl(crc32(entry->crc, (unsigned char *)buf.ptr, buf.size));
+	entry->crc = htonl(crc32(entry->crc, (unsigned char *)buf.ptr, (uInt)buf.size));
 	git_buf_free(&buf);
 
 	/* Write a fake trailer so the pack functions play ball */
diff --git a/src/pack-objects.c b/src/pack-objects.c
@@ -26,7 +26,7 @@ struct unpacked {
 	git_pobject *object;
 	void *data;
 	struct git_delta_index *index;
-	unsigned int depth;
+	int depth;
 };
 
 struct tree_walk_context {
@@ -659,7 +659,7 @@ static int delta_cacheable(git_packbuilder *pb, unsigned long src_size,
 }
 
 static int try_delta(git_packbuilder *pb, struct unpacked *trg,
-		     struct unpacked *src, unsigned int max_depth,
+		     struct unpacked *src, int max_depth,
 		     unsigned long *mem_usage, int *ret)
 {
 	git_pobject *trg_object = trg->object;
diff --git a/src/pack.c b/src/pack.c
@@ -372,7 +372,7 @@ static unsigned char *pack_window_open(
  *  - each byte afterwards: low seven bits are size continuation,
  *    with the high bit being "size continues"
  */
-int git_packfile__object_header(unsigned char *hdr, unsigned long size, git_otype type)
+size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type)
 {
 	unsigned char *hdr_base;
 	unsigned char c;
@@ -392,7 +392,7 @@ int git_packfile__object_header(unsigned char *hdr, unsigned long size, git_otyp
 	}
 	*hdr++ = c;
 
-	return (int)(hdr - hdr_base);
+	return (hdr - hdr_base);
 }
 
 
diff --git a/src/pack.h b/src/pack.h
@@ -112,7 +112,7 @@ typedef struct git_packfile_stream {
 	git_mwindow *mw;
 } git_packfile_stream;
 
-int git_packfile__object_header(unsigned char *hdr, unsigned long size, git_otype type);
+size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type);
 
 int git_packfile_unpack_header(
 		size_t *size_p,
diff --git a/src/path.c b/src/path.c
@@ -834,7 +834,12 @@ int git_path_direach(
 	DIR *dir;
 	path_dirent_data de_data;
 	struct dirent *de, *de_buf = (struct dirent *)&de_data;
+
+	(void)flags;
+
+#ifdef GIT_USE_ICONV
 	git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
+#endif
 
 	if (git_path_to_dir(path) < 0)
 		return -1;
@@ -846,8 +851,10 @@ int git_path_direach(
 		return -1;
 	}
 
+#ifdef GIT_USE_ICONV
 	if ((flags & GIT_PATH_DIR_PRECOMPOSE_UNICODE) != 0)
 		(void)git_path_iconv_init_precompose(&ic);
+#endif
 
 	while (p_readdir_r(dir, de_buf, &de) == 0 && de != NULL) {
 		char *de_path = de->d_name;
@@ -856,8 +863,12 @@ int git_path_direach(
 		if (git_path_is_dot_or_dotdot(de_path))
 			continue;
 
-		if ((error = git_path_iconv(&ic, &de_path, &de_len)) < 0 ||
-			(error = git_buf_put(path, de_path, de_len)) < 0)
+#ifdef GIT_USE_ICONV
+		if ((error = git_path_iconv(&ic, &de_path, &de_len)) < 0)
+			break;
+#endif
+				
+		if ((error = git_buf_put(path, de_path, de_len)) < 0)
 			break;
 
 		error = fn(arg, path);
@@ -871,7 +882,10 @@ int git_path_direach(
 	}
 
 	closedir(dir);
+
+#ifdef GIT_USE_ICONV
 	git_path_iconv_clear(&ic);
+#endif
 
 	return error;
 }
@@ -888,7 +902,12 @@ int git_path_dirload(
 	size_t path_len;
 	path_dirent_data de_data;
 	struct dirent *de, *de_buf = (struct dirent *)&de_data;
+
+	(void)flags;
+
+#ifdef GIT_USE_ICONV
 	git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
+#endif
 
 	assert(path && contents);
 
@@ -903,8 +922,10 @@ int git_path_dirload(
 		return -1;
 	}
 
+#ifdef GIT_USE_ICONV
 	if ((flags & GIT_PATH_DIR_PRECOMPOSE_UNICODE) != 0)
 		(void)git_path_iconv_init_precompose(&ic);
+#endif
 
 	path += prefix_len;
 	path_len -= prefix_len;
@@ -917,8 +938,10 @@ int git_path_dirload(
 		if (git_path_is_dot_or_dotdot(de_path))
 			continue;
 
+#ifdef GIT_USE_ICONV
 		if ((error = git_path_iconv(&ic, &de_path, &de_len)) < 0)
 			break;
+#endif
 
 		alloc_size = path_len + need_slash + de_len + 1 + alloc_extra;
 		if ((entry_path = git__calloc(alloc_size, 1)) == NULL) {
@@ -937,7 +960,10 @@ int git_path_dirload(
 	}
 
 	closedir(dir);
+
+#ifdef GIT_USE_ICONV
 	git_path_iconv_clear(&ic);
+#endif
 
 	if (error != 0)
 		giterr_set(GITERR_OS, "Failed to process directory entry in '%s'", path);
diff --git a/src/path.h b/src/path.h
@@ -425,16 +425,6 @@ extern void git_path_iconv_clear(git_path_iconv_t *ic);
  */
 extern int git_path_iconv(git_path_iconv_t *ic, char **in, size_t *inlen);
 
-#else
-
-typedef struct {
-	int unused;
-} git_path_iconv_t;
-#define GIT_PATH_ICONV_INIT { 0 }
-#define git_path_iconv_init_precompose(X) 0
-#define git_path_iconv_clear(X) (void)(X)
-#define git_path_iconv(X,Y,Z) 0
-
 #endif /* GIT_USE_ICONV */
 
 #endif
diff --git a/src/refs.c b/src/refs.c
@@ -737,7 +737,10 @@ int git_reference__normalize_name(
 	int segment_len, segments_count = 0, error = GIT_EINVALIDSPEC;
 	unsigned int process_flags;
 	bool normalize = (buf != NULL);
+
+#ifdef GIT_USE_ICONV
 	git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
+#endif
 
 	assert(name);
 
@@ -750,13 +753,15 @@ int git_reference__normalize_name(
 	if (normalize)
 		git_buf_clear(buf);
 
+#ifdef GIT_USE_ICONV
 	if ((flags & GIT_REF_FORMAT__PRECOMPOSE_UNICODE) != 0) {
 		size_t namelen = strlen(current);
 		if ((error = git_path_iconv_init_precompose(&ic)) < 0 ||
 			(error = git_path_iconv(&ic, &current, &namelen)) < 0)
 			goto cleanup;
 		error = GIT_EINVALIDSPEC;
 	}
+#endif
 
 	while (true) {
 		segment_len = ensure_segment_validity(current);
@@ -834,7 +839,9 @@ int git_reference__normalize_name(
 	if (error && normalize)
 		git_buf_free(buf);
 
+#ifdef GIT_USE_ICONV
 	git_path_iconv_clear(&ic);
+#endif
 
 	return error;
 }
diff --git a/tests-clar/checkout/conflict.c b/tests-clar/checkout/conflict.c
@@ -1071,6 +1071,9 @@ static void collect_progress(
 {
 	git_vector *paths = payload;
 
+	(void)completed_steps;
+	(void)total_steps;
+
 	if (path == NULL)
 		return;
 
diff --git a/tests-clar/core/iconv.c b/tests-clar/core/iconv.c
@@ -1,22 +1,29 @@
 #include "clar_libgit2.h"
 #include "path.h"
 
+#ifdef GIT_USE_ICONV
 static git_path_iconv_t ic;
 static char *nfc = "\xC3\x85\x73\x74\x72\xC3\xB6\x6D";
 static char *nfd = "\x41\xCC\x8A\x73\x74\x72\x6F\xCC\x88\x6D";
+#endif
 
 void test_core_iconv__initialize(void)
 {
+#ifdef GIT_USE_ICONV
 	cl_git_pass(git_path_iconv_init_precompose(&ic));
+#endif
 }
 
 void test_core_iconv__cleanup(void)
 {
+#ifdef GIT_USE_ICONV
 	git_path_iconv_clear(&ic);
+#endif
 }
 
 void test_core_iconv__unchanged(void)
 {
+#ifdef GIT_USE_ICONV
 	char *data = "Ascii data", *original = data;
 	size_t datalen = strlen(data);
 
@@ -25,10 +32,12 @@ void test_core_iconv__unchanged(void)
 
 	/* There are no high bits set, so this should leave data untouched */
 	cl_assert(data == original);
+#endif
 }
 
 void test_core_iconv__decomposed_to_precomposed(void)
 {
+#ifdef GIT_USE_ICONV
 	char *data = nfd;
 	size_t datalen = strlen(nfd);
 
@@ -38,15 +47,13 @@ void test_core_iconv__decomposed_to_precomposed(void)
 	/* The decomposed nfd string should be transformed to the nfc form
 	 * (on platforms where iconv is enabled, of course).
 	 */
-#ifdef GIT_USE_ICONV
 	cl_assert_equal_s(nfc, data);
-#else
-	cl_assert_equal_s(nfd, data);
 #endif
 }
 
 void test_core_iconv__precomposed_is_unmodified(void)
 {
+#ifdef GIT_USE_ICONV
 	char *data = nfc;
 	size_t datalen = strlen(nfc);
 
@@ -57,4 +64,5 @@ void test_core_iconv__precomposed_is_unmodified(void)
 	 * the high-bit set, the iconv transform should result in no change.
 	 */
 	cl_assert_equal_s(nfc, data);
+#endif
 }
diff --git a/tests-clar/pack/indexer.c b/tests-clar/pack/indexer.c
@@ -100,15 +100,13 @@ void test_pack_indexer__fix_thin(void)
 		unsigned char buffer[128];
 		int fd;
 		ssize_t read;
-		git_off_t left;
 		struct stat st;
 		const char *name = "pack-11f0f69b334728fdd8bc86b80499f22f29d85b15.pack";
 
 		fd = p_open(name, O_RDONLY);
 		cl_assert(fd != -1);
 
 		cl_git_pass(p_stat(name, &st));
-		left = st.st_size;
 
 		cl_git_pass(git_indexer_new(&idx, ".", NULL, NULL, NULL));
 		read = p_read(fd, buffer, sizeof(buffer));
diff --git a/tests-clar/repo/init.c b/tests-clar/repo/init.c
@@ -232,6 +232,7 @@ void test_repo_init__detect_ignorecase(void)
 
 void test_repo_init__detect_precompose_unicode_required(void)
 {
+#ifdef GIT_USE_ICONV
 	char *composed = "ḱṷṓn", *decomposed = "ḱṷṓn";
 	struct stat st;
 	bool found_with_nfd;
@@ -240,7 +241,6 @@ void test_repo_init__detect_precompose_unicode_required(void)
 	found_with_nfd = (p_stat(decomposed, &st) == 0);
 	cl_must_pass(p_unlink(composed));
 
-#ifdef GIT_USE_ICONV
 	assert_config_entry_on_init("core.precomposeunicode", found_with_nfd);
 #else
 	assert_config_entry_on_init("core.precomposeunicode", GIT_ENOTFOUND);
diff --git a/tests-clar/threads/refdb.c b/tests-clar/threads/refdb.c
@@ -147,13 +147,16 @@ static void *delete_refs(void *arg)
 void test_threads_refdb__edit_while_iterate(void)
 {
 	int r, t;
-	git_thread th[THREADS];
 	int id[THREADS];
 	git_oid head;
 	git_reference *ref;
 	char name[128];
 	git_refdb *refdb;
 
+#ifdef GIT_THREADS
+	git_thread th[THREADS];
+#endif
+
 	g_repo = cl_git_sandbox_init("testrepo2");
 
 	cl_git_pass(git_reference_name_to_id(&head, g_repo, "HEAD"));
@@ -187,7 +190,6 @@ void test_threads_refdb__edit_while_iterate(void)
 #ifdef GIT_THREADS
 		cl_git_pass(git_thread_create(&th[t], NULL, fn, &id[t]));
 #else
-		th[t] = t;
 		fn(&id[t]);
 #endif
 	}

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,9 @@ GIT_INLINE(void ) git_array_grow(void _a, size_t item_size)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`#define git_array_alloc(a) \`
`60`		`- ((a).size >= (a).asize) ? \`
	`60`	`+ (((a).size >= (a).asize) ? \`
`61`	`61`	`git_array_grow(&(a), sizeof(*(a).ptr)) : \`
`62`		`- ((a).ptr ? &(a).ptr[(a).size++] : NULL)`
	`62`	`+ ((a).ptr ? &(a).ptr[(a).size++] : NULL))`
`63`	`63`
`64`	`64`	`#define git_array_last(a) ((a).size ? &(a).ptr[(a).size - 1] : NULL)`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -1694,7 +1694,6 @@ static int checkout_write_merge(`
`1694`	`1694`
`1695`	`1695`	`static int checkout_create_conflicts(checkout_data *data)`
`1696`	`1696`	`{`
`1697`		`- git_vector conflicts = GIT_VECTOR_INIT;`
`1698`	`1697`	`checkout_conflictdata *conflict;`
`1699`	`1698`	`size_t i;`
`1700`	`1699`	`int error = 0;`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ static unsigned char *pack_window_open(`
`372`	`372`	`* - each byte afterwards: low seven bits are size continuation,`
`373`	`373`	`* with the high bit being "size continues"`
`374`	`374`	`*/`
`375`		`-int git_packfile__object_header(unsigned char *hdr, unsigned long size, git_otype type)`
	`375`	`+size_t git_packfile__object_header(unsigned char *hdr, size_t size, git_otype type)`
`376`	`376`	`{`
`377`	`377`	`unsigned char *hdr_base;`
`378`	`378`	`unsigned char c;`
`@@ -392,7 +392,7 @@ int git_packfile__object_header(unsigned char *hdr, unsigned long size, git_otyp`
`392`	`392`	`}`
`393`	`393`	`*hdr++ = c;`
`394`	`394`
`395`		`- return (int)(hdr - hdr_base);`
	`395`	`+ return (hdr - hdr_base);`
`396`	`396`	`}`
`397`	`397`
`398`	`398`
Original file line number	Diff line number	Diff line change
`@@ -1071,6 +1071,9 @@ static void collect_progress(`
`1071`	`1071`	`{`
`1072`	`1072`	`git_vector *paths = payload;`
`1073`	`1073`
	`1074`	`+ (void)completed_steps;`
	`1075`	`+ (void)total_steps;`
	`1076`	`+`
`1074`	`1077`	`if (path == NULL)`
`1075`	`1078`	`return;`
`1076`	`1079`