Commit 9e44289c by Edward Thomson

Merge pull request #2612 from ethomson/warnings

Clean up some warnings
parents 70f7e2c6 5b0c6306
...@@ -397,7 +397,7 @@ static int show_suffix( ...@@ -397,7 +397,7 @@ static int show_suffix(
const git_oid* id, const git_oid* id,
size_t abbrev_size) size_t abbrev_size)
{ {
int error, size; int error, size = 0;
char hex_oid[GIT_OID_HEXSZ]; char hex_oid[GIT_OID_HEXSZ];
...@@ -818,7 +818,8 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g ...@@ -818,7 +818,8 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
/* If we didn't find *any* tags, we fall back to the commit's id */ /* If we didn't find *any* tags, we fall back to the commit's id */
if (result->fallback_to_id) { if (result->fallback_to_id) {
char hex_oid[GIT_OID_HEXSZ + 1] = {0}; char hex_oid[GIT_OID_HEXSZ + 1] = {0};
int size; int size = 0;
if ((error = find_unique_abbrev_size( if ((error = find_unique_abbrev_size(
&size, repo, &result->commit_id, opts.abbreviated_size)) < 0) &size, repo, &result->commit_id, opts.abbreviated_size)) < 0)
return -1; return -1;
......
...@@ -63,8 +63,12 @@ void openssl_locking_function(int mode, int n, const char *file, int line) ...@@ -63,8 +63,12 @@ void openssl_locking_function(int mode, int n, const char *file, int line)
git_mutex_unlock(&openssl_locks[n]); git_mutex_unlock(&openssl_locks[n]);
} }
} }
#endif
static void shutdown_ssl(void)
{
git__free(openssl_locks);
}
#endif
static void init_ssl(void) static void init_ssl(void)
{ {
...@@ -112,6 +116,8 @@ static void init_ssl(void) ...@@ -112,6 +116,8 @@ static void init_ssl(void)
CRYPTO_set_locking_callback(openssl_locking_function); CRYPTO_set_locking_callback(openssl_locking_function);
} }
git__on_shutdown(shutdown_ssl);
# endif # endif
#endif #endif
} }
......
...@@ -41,6 +41,8 @@ int git_mwindow_files_init(void) ...@@ -41,6 +41,8 @@ int git_mwindow_files_init(void)
if (git__pack_cache) if (git__pack_cache)
return 0; return 0;
git__on_shutdown(git_mwindow_files_free);
return git_strmap_alloc(&git__pack_cache); return git_strmap_alloc(&git__pack_cache);
} }
......
...@@ -1198,7 +1198,9 @@ int git_path_dirload_with_stat( ...@@ -1198,7 +1198,9 @@ int git_path_dirload_with_stat(
if (error == GIT_ENOTFOUND) { if (error == GIT_ENOTFOUND) {
/* file was removed between readdir and lstat */ /* file was removed between readdir and lstat */
char *entry_path = git_vector_get(contents, i);
git_vector_remove(contents, i--); git_vector_remove(contents, i--);
git__free(entry_path);
} else { } else {
/* Treat the file as unreadable if we get any other error */ /* Treat the file as unreadable if we get any other error */
memset(&ps->st, 0, sizeof(ps->st)); memset(&ps->st, 0, sizeof(ps->st));
...@@ -1215,8 +1217,9 @@ int git_path_dirload_with_stat( ...@@ -1215,8 +1217,9 @@ int git_path_dirload_with_stat(
ps->path[ps->path_len] = '\0'; ps->path[ps->path_len] = '\0';
} }
else if (!S_ISREG(ps->st.st_mode) && !S_ISLNK(ps->st.st_mode)) { else if (!S_ISREG(ps->st.st_mode) && !S_ISLNK(ps->st.st_mode)) {
/* skip everything but dirs, plain files, and symlinks */ char *entry_path = git_vector_get(contents, i);
git_vector_remove(contents, i--); git_vector_remove(contents, i--);
git__free(entry_path);
} }
} }
......
...@@ -116,9 +116,9 @@ static int get_check_cert(int *out, git_repository *repo) ...@@ -116,9 +116,9 @@ static int get_check_cert(int *out, git_repository *repo)
static int canonicalize_url(git_buf *out, const char *in) static int canonicalize_url(git_buf *out, const char *in)
{ {
#ifdef GIT_WIN32
const char *c; const char *c;
#ifdef GIT_WIN32
/* Given a UNC path like \\server\path, we need to convert this /* Given a UNC path like \\server\path, we need to convert this
* to //server/path for compatibility with core git. * to //server/path for compatibility with core git.
*/ */
...@@ -1255,6 +1255,7 @@ static int opportunistic_updates(const git_remote *remote, git_vector *refs, con ...@@ -1255,6 +1255,7 @@ static int opportunistic_updates(const git_remote *remote, git_vector *refs, con
error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, true, sig, msg); error = git_reference_create(&ref, remote->repo, refname.ptr, &head->oid, true, sig, msg);
git_buf_free(&refname); git_buf_free(&refname);
git_reference_free(ref);
if (error < 0) if (error < 0)
return error; return error;
......
...@@ -183,8 +183,10 @@ GIT_INLINE(int64_t) git_atomic64_add(git_atomic64 *a, int64_t addend) ...@@ -183,8 +183,10 @@ GIT_INLINE(int64_t) git_atomic64_add(git_atomic64 *a, int64_t addend)
/* Pthreads Mutex */ /* Pthreads Mutex */
#define git_mutex unsigned int #define git_mutex unsigned int
static int git_mutex_init(git_mutex* mutex) { GIT_UNUSED(mutex); return 0; } GIT_INLINE(int) git_mutex_init(git_mutex *mutex) \
static int git_mutex_lock(git_mutex* mutex) { GIT_UNUSED(mutex); return 0; } { GIT_UNUSED(mutex); return 0; }
GIT_INLINE(int) git_mutex_lock(git_mutex *mutex) \
{ GIT_UNUSED(mutex); return 0; }
#define git_mutex_unlock(a) (void)0 #define git_mutex_unlock(a) (void)0
#define git_mutex_free(a) (void)0 #define git_mutex_free(a) (void)0
......
...@@ -274,7 +274,7 @@ static int update_target(git_refdb *db, transaction_node *node) ...@@ -274,7 +274,7 @@ static int update_target(git_refdb *db, transaction_node *node)
} else if (node->ref_type == GIT_REF_SYMBOLIC) { } else if (node->ref_type == GIT_REF_SYMBOLIC) {
ref = git_reference__alloc_symbolic(node->name, node->target.symbolic); ref = git_reference__alloc_symbolic(node->name, node->target.symbolic);
} else { } else {
assert(0); abort();
} }
GITERR_CHECK_ALLOC(ref); GITERR_CHECK_ALLOC(ref);
...@@ -287,7 +287,7 @@ static int update_target(git_refdb *db, transaction_node *node) ...@@ -287,7 +287,7 @@ static int update_target(git_refdb *db, transaction_node *node)
} else if (node->ref_type == GIT_REF_SYMBOLIC) { } else if (node->ref_type == GIT_REF_SYMBOLIC) {
error = git_refdb_unlock(db, node->payload, true, update_reflog, ref, node->sig, node->message); error = git_refdb_unlock(db, node->payload, true, update_reflog, ref, node->sig, node->message);
} else { } else {
assert(0); abort();
} }
git_reference_free(ref); git_reference_free(ref);
...@@ -300,7 +300,7 @@ int git_transaction_commit(git_transaction *tx) ...@@ -300,7 +300,7 @@ int git_transaction_commit(git_transaction *tx)
{ {
transaction_node *node; transaction_node *node;
git_strmap_iter pos; git_strmap_iter pos;
int error; int error = 0;
assert(tx); assert(tx);
......
...@@ -552,7 +552,7 @@ static int http_connect(http_subtransport *t) ...@@ -552,7 +552,7 @@ static int http_connect(http_subtransport *t)
#ifdef GIT_SSL #ifdef GIT_SSL
if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL) { if ((!error || error == GIT_ECERTIFICATE) && t->owner->certificate_check_cb != NULL) {
X509 *cert = SSL_get_peer_certificate(t->socket.ssl.ssl); X509 *cert = SSL_get_peer_certificate(t->socket.ssl.ssl);
git_cert_x509 cert_info; git_cert_x509 cert_info, *cert_info_ptr;
int len, is_valid; int len, is_valid;
unsigned char *guard, *encoded_cert; unsigned char *guard, *encoded_cert;
...@@ -581,7 +581,10 @@ static int http_connect(http_subtransport *t) ...@@ -581,7 +581,10 @@ static int http_connect(http_subtransport *t)
cert_info.cert_type = GIT_CERT_X509; cert_info.cert_type = GIT_CERT_X509;
cert_info.data = encoded_cert; cert_info.data = encoded_cert;
cert_info.len = len; cert_info.len = len;
error = t->owner->certificate_check_cb((git_cert *) &cert_info, is_valid, t->connection_data.host, t->owner->message_cb_payload);
cert_info_ptr = &cert_info;
error = t->owner->certificate_check_cb((git_cert *) cert_info_ptr, is_valid, t->connection_data.host, t->owner->message_cb_payload);
git__free(encoded_cert); git__free(encoded_cert);
if (error < 0) { if (error < 0) {
......
...@@ -457,30 +457,34 @@ static int _git_ssh_setup_conn( ...@@ -457,30 +457,34 @@ static int _git_ssh_setup_conn(
LIBSSH2_SESSION* session=NULL; LIBSSH2_SESSION* session=NULL;
LIBSSH2_CHANNEL* channel=NULL; LIBSSH2_CHANNEL* channel=NULL;
t->current_stream = NULL;
*stream = NULL; *stream = NULL;
if (ssh_stream_alloc(t, url, cmd, stream) < 0) if (ssh_stream_alloc(t, url, cmd, stream) < 0)
return -1; return -1;
s = (ssh_stream *)*stream; s = (ssh_stream *)*stream;
s->session = NULL;
s->channel = NULL;
if (!git__prefixcmp(url, prefix_ssh)) { if (!git__prefixcmp(url, prefix_ssh)) {
if ((error = gitno_extract_url_parts(&host, &port, &path, &user, &pass, url, default_port)) < 0) if ((error = gitno_extract_url_parts(&host, &port, &path, &user, &pass, url, default_port)) < 0)
goto on_error; goto done;
} else { } else {
if ((error = git_ssh_extract_url_parts(&host, &user, url)) < 0) if ((error = git_ssh_extract_url_parts(&host, &user, url)) < 0)
goto on_error; goto done;
port = git__strdup(default_port); port = git__strdup(default_port);
GITERR_CHECK_ALLOC(port); GITERR_CHECK_ALLOC(port);
} }
if ((error = gitno_connect(&s->socket, host, port, 0)) < 0) if ((error = gitno_connect(&s->socket, host, port, 0)) < 0)
goto on_error; goto done;
if ((error = _git_ssh_session_create(&session, s->socket)) < 0) if ((error = _git_ssh_session_create(&session, s->socket)) < 0)
goto on_error; goto done;
if (t->owner->certificate_check_cb != NULL) { if (t->owner->certificate_check_cb != NULL) {
git_cert_hostkey cert = { 0 }; git_cert_hostkey cert = { 0 }, *cert_ptr;
const char *key; const char *key;
cert.cert_type = GIT_CERT_HOSTKEY_LIBSSH2; cert.cert_type = GIT_CERT_HOSTKEY_LIBSSH2;
...@@ -499,37 +503,41 @@ static int _git_ssh_setup_conn( ...@@ -499,37 +503,41 @@ static int _git_ssh_setup_conn(
if (cert.type == 0) { if (cert.type == 0) {
giterr_set(GITERR_SSH, "unable to get the host key"); giterr_set(GITERR_SSH, "unable to get the host key");
return -1; error = -1;
goto done;
} }
/* We don't currently trust any hostkeys */ /* We don't currently trust any hostkeys */
giterr_clear(); giterr_clear();
error = t->owner->certificate_check_cb((git_cert *) &cert, 0, host, t->owner->message_cb_payload);
cert_ptr = &cert;
error = t->owner->certificate_check_cb((git_cert *) cert_ptr, 0, host, t->owner->message_cb_payload);
if (error < 0) { if (error < 0) {
if (!giterr_last()) if (!giterr_last())
giterr_set(GITERR_NET, "user cancelled hostkey check"); giterr_set(GITERR_NET, "user cancelled hostkey check");
goto on_error; goto done;
} }
} }
/* we need the username to ask for auth methods */ /* we need the username to ask for auth methods */
if (!user) { if (!user) {
if ((error = request_creds(&cred, t, NULL, GIT_CREDTYPE_USERNAME)) < 0) if ((error = request_creds(&cred, t, NULL, GIT_CREDTYPE_USERNAME)) < 0)
goto on_error; goto done;
user = git__strdup(((git_cred_username *) cred)->username); user = git__strdup(((git_cred_username *) cred)->username);
cred->free(cred); cred->free(cred);
cred = NULL; cred = NULL;
if (!user) if (!user)
goto on_error; goto done;
} else if (user && pass) { } else if (user && pass) {
if ((error = git_cred_userpass_plaintext_new(&cred, user, pass)) < 0) if ((error = git_cred_userpass_plaintext_new(&cred, user, pass)) < 0)
goto on_error; goto done;
} }
if ((error = list_auth_methods(&auth_methods, session, user)) < 0) if ((error = list_auth_methods(&auth_methods, session, user)) < 0)
goto on_error; goto done;
error = GIT_EAUTH; error = GIT_EAUTH;
/* if we already have something to try */ /* if we already have something to try */
...@@ -543,25 +551,25 @@ static int _git_ssh_setup_conn( ...@@ -543,25 +551,25 @@ static int _git_ssh_setup_conn(
} }
if ((error = request_creds(&cred, t, user, auth_methods)) < 0) if ((error = request_creds(&cred, t, user, auth_methods)) < 0)
goto on_error; goto done;
if (strcmp(user, git_cred__username(cred))) { if (strcmp(user, git_cred__username(cred))) {
giterr_set(GITERR_SSH, "username does not match previous request"); giterr_set(GITERR_SSH, "username does not match previous request");
error = -1; error = -1;
goto on_error; goto done;
} }
error = _git_ssh_authenticate_session(session, cred); error = _git_ssh_authenticate_session(session, cred);
} }
if (error < 0) if (error < 0)
goto on_error; goto done;
channel = libssh2_channel_open_session(session); channel = libssh2_channel_open_session(session);
if (!channel) { if (!channel) {
error = -1; error = -1;
ssh_error(session, "Failed to open SSH channel"); ssh_error(session, "Failed to open SSH channel");
goto on_error; goto done;
} }
libssh2_channel_set_blocking(channel, 1); libssh2_channel_set_blocking(channel, 1);
...@@ -570,36 +578,25 @@ static int _git_ssh_setup_conn( ...@@ -570,36 +578,25 @@ static int _git_ssh_setup_conn(
s->channel = channel; s->channel = channel;
t->current_stream = s; t->current_stream = s;
if (cred)
cred->free(cred);
git__free(host); done:
git__free(port); if (error < 0) {
git__free(path); if (*stream)
git__free(user); ssh_stream_free(*stream);
git__free(pass);
return 0;
on_error:
s->session = NULL;
s->channel = NULL;
t->current_stream = NULL;
if (*stream) if (session)
ssh_stream_free(*stream); libssh2_session_free(session);
}
if (cred) if (cred)
cred->free(cred); cred->free(cred);
git__free(host); git__free(host);
git__free(port); git__free(port);
git__free(path);
git__free(user); git__free(user);
git__free(pass); git__free(pass);
if (session)
libssh2_session_free(session);
return error; return error;
} }
......
...@@ -26,7 +26,7 @@ static int git_style_unc_path(git_buf *buf, const char *host, const char *path) ...@@ -26,7 +26,7 @@ static int git_style_unc_path(git_buf *buf, const char *host, const char *path)
if (path[0] == '/') if (path[0] == '/')
path++; path++;
if (isalpha(path[0]) && path[1] == ':' && path[2] == '/') { if (git__isalpha(path[0]) && path[1] == ':' && path[2] == '/') {
git_buf_printf(buf, "%c$/", path[0]); git_buf_printf(buf, "%c$/", path[0]);
path += 3; path += 3;
} }
......
...@@ -37,6 +37,7 @@ void test_config_snapshot__create_snapshot(void) ...@@ -37,6 +37,7 @@ void test_config_snapshot__create_snapshot(void)
cl_git_pass(git_config_get_int32(&tmp, snapshot, "old.value")); cl_git_pass(git_config_get_int32(&tmp, snapshot, "old.value"));
cl_assert_equal_i(5, tmp); cl_assert_equal_i(5, tmp);
git_config_free(new_snapshot);
git_config_free(snapshot); git_config_free(snapshot);
git_config_free(cfg); git_config_free(cfg);
} }
......
...@@ -170,6 +170,8 @@ void test_index_cache__two_levels(void) ...@@ -170,6 +170,8 @@ void test_index_cache__two_levels(void)
tree_cache = git_tree_cache_get(index->tree, "subdir"); tree_cache = git_tree_cache_get(index->tree, "subdir");
cl_assert(tree_cache); cl_assert(tree_cache);
cl_assert_equal_i(1, tree_cache->entry_count); cl_assert_equal_i(1, tree_cache->entry_count);
git_index_free(index);
} }
void test_index_cache__read_tree_children(void) void test_index_cache__read_tree_children(void)
......
...@@ -171,6 +171,7 @@ void test_revwalk_mergebase__multiple_merge_bases_many_commits(void) ...@@ -171,6 +171,7 @@ void test_revwalk_mergebase__multiple_merge_bases_many_commits(void)
cl_assert_equal_oid(&expected2, &result.ids[1]); cl_assert_equal_oid(&expected2, &result.ids[1]);
git_oidarray_free(&result); git_oidarray_free(&result);
git__free(input);
} }
void test_revwalk_mergebase__no_off_by_one_missing(void) void test_revwalk_mergebase__no_off_by_one_missing(void)
......
...@@ -35,6 +35,7 @@ void test_submodule_repository_init__basic(void) ...@@ -35,6 +35,7 @@ void test_submodule_repository_init__basic(void)
cl_assert(git_path_isfile("submod2/.git/modules/" "sm_gitmodules_only" "/HEAD")); cl_assert(git_path_isfile("submod2/.git/modules/" "sm_gitmodules_only" "/HEAD"));
git_config_free(cfg); git_config_free(cfg);
git_submodule_free(sm);
git_repository_free(repo); git_repository_free(repo);
git_buf_free(&dot_git_content); git_buf_free(&dot_git_content);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment