Merge pull request libgit2#3834 from pks-t/pks/cleanups

Cleanups

Author: Edward Thomson

src/clone.c

@@ -461,14 +461,6 @@ int git_clone_init_options(git_clone_options *opts, unsigned int version)
 	return 0;
 }
 
-static const char *repository_base(git_repository *repo)
-{
-	if (git_repository_is_bare(repo))
-		return git_repository_path(repo);
-
-	return git_repository_workdir(repo);
-}
-
 static bool can_link(const char *src, const char *dst, int link)
 {
 #ifdef GIT_WIN32

src/diff_driver.c

@@ -59,7 +59,7 @@ static git_diff_driver global_drivers[3] = {
 	{ DIFF_DRIVER_TEXT,   GIT_DIFF_FORCE_TEXT, 0 },
 };
 
-git_diff_driver_registry *git_diff_driver_registry_new()
+git_diff_driver_registry *git_diff_driver_registry_new(void)
 {
 	git_diff_driver_registry *reg =
 		git__calloc(1, sizeof(git_diff_driver_registry));

src/remote.c

@@ -547,53 +547,6 @@ static int lookup_remote_prune_config(git_remote *remote, git_config *config, co
 	return error;
 }
 
-static int update_config_refspec(const git_remote *remote, git_config *config, int direction)
-{
-	git_buf name = GIT_BUF_INIT;
-	unsigned int push;
-	const char *dir;
-	size_t i;
-	int error = 0;
-	const char *cname;
-
-	push = direction == GIT_DIRECTION_PUSH;
-	dir = push ? "push" : "fetch";
-
-	if (git_buf_printf(&name, "remote.%s.%s", remote->name, dir) < 0)
-		return -1;
-	cname = git_buf_cstr(&name);
-
-	/* Clear out the existing config */
-	while (!error)
-		error = git_config_delete_multivar(config, cname, ".*");
-
-	if (error != GIT_ENOTFOUND)
-		return error;
-
-	for (i = 0; i < remote->refspecs.length; i++) {
-		git_refspec *spec = git_vector_get(&remote->refspecs, i);
-
-		if (spec->push != push)
-			continue;
-
-		// "$^" is a unmatcheable regexp: it will not match anything at all, so
-		// all values will be considered new and we will not replace any
-		// present value.
-		if ((error = git_config_set_multivar(
-				config, cname, "$^", spec->string)) < 0) {
-			goto cleanup;
-		}
-	}
-
-	giterr_clear();
-	error = 0;
-
-cleanup:
-	git_buf_free(&name);
-
-	return error;
-}
-
 const char *git_remote_name(const git_remote *remote)
 {
 	assert(remote);
@@ -2103,34 +2056,6 @@ int git_remote_add_push(git_repository *repo, const char *remote, const char *re
 	return write_add_refspec(repo, remote, refspec, false);
 }
 
-static int set_refspecs(git_remote *remote, git_strarray *array, int push)
-{
-	git_vector *vec = &remote->refspecs;
-	git_refspec *spec;
-	size_t i;
-
-	/* Start by removing any refspecs of the same type */
-	for (i = 0; i < vec->length; i++) {
-		spec = git_vector_get(vec, i);
-		if (spec->push != push)
-			continue;
-
-		git_refspec__free(spec);
-		git__free(spec);
-		git_vector_remove(vec, i);
-		i--;
-	}
-
-	/* And now we add the new ones */
-
-	for (i = 0; i < array->count; i++) {
-		if (add_refspec(remote, array->strings[i], !push) < 0)
-			return -1;
-	}
-
-	return 0;
-}
-
 static int copy_refspecs(git_strarray *array, const git_remote *remote, unsigned int push)
 {
 	size_t i;

src/settings.c

@@ -23,7 +23,7 @@ void git_libgit2_version(int *major, int *minor, int *rev)
 	*rev = LIBGIT2_VER_REVISION;
 }
 
-int git_libgit2_features()
+int git_libgit2_features(void)
 {
 	return 0
 #ifdef GIT_THREADS
@@ -73,12 +73,12 @@ static int config_level_to_sysdir(int config_level)
 extern char *git__user_agent;
 extern char *git__ssl_ciphers;
 
-const char *git_libgit2__user_agent()
+const char *git_libgit2__user_agent(void)
 {
 	return git__user_agent;
 }
 
-const char *git_libgit2__ssl_ciphers()
+const char *git_libgit2__ssl_ciphers(void)
 {
 	return git__ssl_ciphers;
 }

tests/clar.c

@@ -409,7 +409,7 @@ clar_test_init(int argc, char **argv)
 }
 
 int
-clar_test_run()
+clar_test_run(void)
 {
 	if (_clar.argc > 1)
 		clar_parse_args(_clar.argc, _clar.argv);
@@ -424,7 +424,7 @@ clar_test_run()
 }
 
 void
-clar_test_shutdown()
+clar_test_shutdown(void)
 {
 	clar_print_shutdown(
 		_clar.tests_ran,

tests/network/remote/rename.c

@@ -16,16 +16,6 @@ void test_network_remote_rename__cleanup(void)
 	cl_git_sandbox_cleanup();
 }
 
-static int dont_call_me_cb(const char *fetch_refspec, void *payload)
-{
-	GIT_UNUSED(fetch_refspec);
-	GIT_UNUSED(payload);
-
-	cl_assert(false);
-
-	return -1;
-}
-
 void test_network_remote_rename__renaming_a_remote_moves_related_configuration_section(void)
 {
 	git_strarray problems = {0};