PR 148586: Merge users/johasc/gvfs-gcc to gvfs/master

This Pull Request lets `gvfs/master` build in Git for Windows' SDK, using the GCC provided therein.

 - Avoid declarations after statements
 - Use C types
 - Avoid function definition with an ellipsis

Author: dscho

cache-tree.c

@@ -244,9 +244,8 @@ static int update_one(struct cache_tree *it,
 		      int flags)
 {
 	struct strbuf buffer;
-	int missing_ok = flags & WRITE_TREE_MISSING_OK;
-	if (gvfs_config_is_set(GVFS_MISSING_OK))
-		missing_ok = WRITE_TREE_MISSING_OK;
+	int missing_ok = gvfs_config_is_set(GVFS_MISSING_OK) ?
+		WRITE_TREE_MISSING_OK : (flags & WRITE_TREE_MISSING_OK);
 	int dryrun = flags & WRITE_TREE_DRY_RUN;
 	int repair = flags & WRITE_TREE_REPAIR;
 	int to_invalidate = 0;

gvfs.h

@@ -27,7 +27,7 @@ static inline int gvfs_config_is_set(int mask) {
 	return (core_gvfs & mask) == mask;
 }
 
-static inline int gvfs_config_is_set_any() {
+static inline int gvfs_config_is_set_any(void) {
 	return core_gvfs > 0;
 }
 
@@ -51,4 +51,4 @@ static inline int gvfs_config_load_and_is_set(int mask) {
 }
 
 
-#endif /* GVFS_H */
+#endif /* GVFS_H */

name-hash.c

@@ -115,10 +115,11 @@ static int cache_entry_cmp(const struct cache_entry *ce1,
 static void lazy_init_name_hash(struct index_state *istate)
 {
 	int nr;
+	uint64_t start;
 
 	if (istate->name_hash_initialized)
 		return;
-	uint64_t start = getnanotime();
+	start = getnanotime();
 	hashmap_init(&istate->name_hash, (hashmap_cmp_fn) cache_entry_cmp,
 			istate->cache_nr);
 	hashmap_init(&istate->dir_hash, (hashmap_cmp_fn) dir_entry_cmp, 0);

read-cache.c

@@ -1650,12 +1650,13 @@ int read_index_from(struct index_state *istate, const char *path)
 {
 	struct split_index *split_index;
 	int ret;
+	uint64_t start;
 
 	/* istate->initialized covers both .git/index and .git/sharedindex.xxx */
 	if (istate->initialized)
 		return istate->cache_nr;
 
-	uint64_t start = getnanotime();
+	start = getnanotime();
 	ret = do_read_index(istate, path, 0);
 
 	split_index = istate->split_index;