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

Cleanups

Browse Source
This commit is contained in:
Russell Belfer 2014-03-31 13:31:01 -07:00
parent c856f8c503
commit 7dcd42a55f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/iterator.c
View File

@ -10,7 +10,7 @@
#include "index.h" #include "index.h"
#include "ignore.h" #include "ignore.h"
#include "buffer.h" #include "buffer.h"
#include "git2/submodule.h" #include "submodule.h"
#include <ctype.h> #include <ctype.h>
#define ITERATOR_SET_CB(P,NAME_LC) do { \ #define ITERATOR_SET_CB(P,NAME_LC) do { \

4
src/merge_file.c
View File

@ -117,7 +117,7 @@ static int git_merge_file__from_inputs(
memset(out, 0x0, sizeof(git_merge_file_result)); memset(out, 0x0, sizeof(git_merge_file_result));
merge_file_normalize_opts(&options, given_opts); merge_file_normalize_opts(&options, given_opts);
memset(&xmparam, 0x0, sizeof(xmparam_t)); memset(&xmparam, 0x0, sizeof(xmparam_t));
@ -165,7 +165,7 @@ static int git_merge_file__from_inputs(
} }
out->automergeable = (xdl_result == 0); out->automergeable = (xdl_result == 0);
out->ptr = (unsigned char *)mmbuffer.ptr; out->ptr = (const char *)mmbuffer.ptr;
out->len = mmbuffer.size; out->len = mmbuffer.size;
out->mode = merge_file_best_mode(ancestor, ours, theirs); out->mode = merge_file_best_mode(ancestor, ours, theirs);

2
src/submodule.h
View File

@ -120,7 +120,7 @@ enum {
((S) & ~(0xFFFFFFFFu << 20)) ((S) & ~(0xFFFFFFFFu << 20))
/* Internal submodule check does not attempt to refresh cached data */ /* Internal submodule check does not attempt to refresh cached data */
bool git_submodule__is_submodule(git_repository *repo, const char *name); extern bool git_submodule__is_submodule(git_repository *repo, const char *name);
/* Internal status fn returns status and optionally the various OIDs */ /* Internal status fn returns status and optionally the various OIDs */
extern int git_submodule__status( extern int git_submodule__status(