proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-31 19:05:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix valgrind warnings and spurious error messages

Browse Source 
Just clean up valgrind warnings about uninitialized memory
and also clear out errno in some cases where it results in
a false error message being generated at a later point.
This commit is contained in:
Russell Belfer 2012-08-24 12:19:22 -07:00
parent 5f4a61aea8
commit 97a17e4e9f
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/checkout.c
View File

@ -31,7 +31,7 @@ typedef struct tree_walk_data
git_checkout_opts *opts; git_checkout_opts *opts;
git_repository *repo; git_repository *repo;
git_odb *odb; git_odb *odb;
bool do_symlinks; bool no_symlinks;
} tree_walk_data; } tree_walk_data;
@ -48,9 +48,9 @@ static int blob_contents_to_link(tree_walk_data *data, git_buf *fnbuf,
/* Create the link */ /* Create the link */
const char *new = git_buf_cstr(&linktarget), const char *new = git_buf_cstr(&linktarget),
*old = git_buf_cstr(fnbuf); *old = git_buf_cstr(fnbuf);
retcode = data->do_symlinks retcode = data->no_symlinks
? p_symlink(new, old) ? git_futils_fake_symlink(new, old)
: git_futils_fake_symlink(new, old); : p_symlink(new, old);
} }
git_buf_free(&linktarget); git_buf_free(&linktarget);
git_blob_free(blob); git_blob_free(blob);
@ -176,13 +176,14 @@ int git_checkout_head(git_repository *repo, git_checkout_opts *opts, git_indexer
return GIT_ERROR; return GIT_ERROR;
} }
memset(&payload, 0, sizeof(payload));
/* Determine if symlinks should be handled */ /* Determine if symlinks should be handled */
if (!git_repository_config(&cfg, repo)) { if (!git_repository_config__weakptr(&cfg, repo)) {
int temp = true; int temp = true;
if (!git_config_get_bool(&temp, cfg, "core.symlinks")) { if (!git_config_get_bool(&temp, cfg, "core.symlinks")) {
payload.do_symlinks = !!temp; payload.no_symlinks = !temp;
} }
git_config_free(cfg);
} }
stats->total = stats->processed = 0; stats->total = stats->processed = 0;

5
src/errors.c
View File

@ -110,6 +110,11 @@ void giterr_set_regex(const regex_t *regex, int error_code)
void giterr_clear(void) void giterr_clear(void)
{ {
GIT_GLOBAL->last_error = NULL; GIT_GLOBAL->last_error = NULL;
errno = 0;
#ifdef GIT_WIN32
SetLastError(0);
#endif
} }
const git_error *giterr_last(void) const git_error *giterr_last(void)

1
src/filebuf.c
View File

@ -50,6 +50,7 @@ static int lock_file(git_filebuf *file, int flags)
if (flags & GIT_FILEBUF_FORCE) if (flags & GIT_FILEBUF_FORCE)
p_unlink(file->path_lock); p_unlink(file->path_lock);
else { else {
giterr_clear(); /* actual OS error code just confuses */
giterr_set(GITERR_OS, giterr_set(GITERR_OS,
"Failed to lock file '%s' for writing", file->path_lock); "Failed to lock file '%s' for writing", file->path_lock);
return -1; return -1;

2
src/submodule.c
View File

@ -367,6 +367,8 @@ int git_submodule_add_to_index(git_submodule *sm, int write_index)
error = -1; error = -1;
goto cleanup; goto cleanup;
} }
memset(&entry, 0, sizeof(entry));
entry.path = sm->path; entry.path = sm->path;
git_index__init_entry_from_stat(&st, &entry); git_index__init_entry_from_stat(&st, &entry);