Commit 7dcd42a55f5fdc61e8e8de472ec54ccc0613e23c
2014-03-31T13:31:01
Cleanups
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/src/iterator.c b/src/iterator.c
index 1276903..a7a4491 100644
--- a/src/iterator.c
+++ b/src/iterator.c
@@ -10,7 +10,7 @@
#include "index.h"
#include "ignore.h"
#include "buffer.h"
-#include "git2/submodule.h"
+#include "submodule.h"
#include <ctype.h>
#define ITERATOR_SET_CB(P,NAME_LC) do { \
diff --git a/src/merge_file.c b/src/merge_file.c
index ab9ca41..ff03644 100644
--- a/src/merge_file.c
+++ b/src/merge_file.c
@@ -117,7 +117,7 @@ static int git_merge_file__from_inputs(
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));
@@ -165,7 +165,7 @@ static int git_merge_file__from_inputs(
}
out->automergeable = (xdl_result == 0);
- out->ptr = (unsigned char *)mmbuffer.ptr;
+ out->ptr = (const char *)mmbuffer.ptr;
out->len = mmbuffer.size;
out->mode = merge_file_best_mode(ancestor, ours, theirs);
diff --git a/src/submodule.h b/src/submodule.h
index 8199eb1..1c41897 100644
--- a/src/submodule.h
+++ b/src/submodule.h
@@ -120,7 +120,7 @@ enum {
((S) & ~(0xFFFFFFFFu << 20))
/* 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 */
extern int git_submodule__status(