summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hagervall <hager@cs.umu.se>2007-07-14 23:14:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-15 05:44:09 (GMT)
commitbaffc0e7708de1655665d150081e8880501736fe (patch)
tree267d9bfd87967c891fc25e8b5dcf1376ee8c816c
parent46cf98baa5a1d74a9d00dc1092b29e4af93e8615 (diff)
downloadgit-baffc0e7708de1655665d150081e8880501736fe.zip
git-baffc0e7708de1655665d150081e8880501736fe.tar.gz
git-baffc0e7708de1655665d150081e8880501736fe.tar.bz2
Make every builtin-*.c file #include "builtin.h"
Make every builtin-*.c file #include "builtin.h". Also takes care of some declaration/definition mismatches. Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-bundle.c1
-rw-r--r--builtin-checkout-index.c1
-rw-r--r--builtin-fetch--tool.c1
-rw-r--r--builtin-for-each-ref.c3
-rw-r--r--builtin-fsck.c3
-rw-r--r--builtin-gc.c1
-rw-r--r--builtin-merge-base.c1
-rw-r--r--builtin-merge-file.c7
-rw-r--r--builtin-pack-refs.c1
-rw-r--r--builtin-rerere.c1
-rw-r--r--builtin-runstatus.c1
-rw-r--r--builtin-show-ref.c1
12 files changed, 17 insertions, 5 deletions
diff --git a/builtin-bundle.c b/builtin-bundle.c
index 306ad29..6ae5ab0 100644
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "object.h"
#include "commit.h"
diff --git a/builtin-checkout-index.c b/builtin-checkout-index.c
index 8460f97..75377b9 100644
--- a/builtin-checkout-index.c
+++ b/builtin-checkout-index.c
@@ -36,6 +36,7 @@
* of "-a" causing problems (not possible in the above example,
* but get used to it in scripting!).
*/
+#include "builtin.h"
#include "cache.h"
#include "strbuf.h"
#include "quote.h"
diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index ed4d5de..e2f8ede 100644
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "commit.h"
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
index 2b21842..0afa1c5 100644
--- a/builtin-for-each-ref.c
+++ b/builtin-for-each-ref.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "object.h"
@@ -796,7 +797,7 @@ static struct ref_sort *default_sort(void)
return sort;
}
-int cmd_for_each_ref(int ac, const char **av, char *prefix)
+int cmd_for_each_ref(int ac, const char **av, const char *prefix)
{
int i, num_refs;
const char *format = NULL;
diff --git a/builtin-fsck.c b/builtin-fsck.c
index a6ef65e..350ec5e 100644
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "commit.h"
#include "tree.h"
@@ -659,7 +660,7 @@ static const char fsck_usage[] =
"git-fsck [--tags] [--root] [[--unreachable] [--cache] [--full] "
"[--strict] [--verbose] <head-sha1>*]";
-int cmd_fsck(int argc, char **argv, const char *prefix)
+int cmd_fsck(int argc, const char **argv, const char *prefix)
{
int i, heads;
diff --git a/builtin-gc.c b/builtin-gc.c
index 45025fb..9397482 100644
--- a/builtin-gc.c
+++ b/builtin-gc.c
@@ -10,6 +10,7 @@
* Copyright (c) 2006 Shawn O. Pearce
*/
+#include "builtin.h"
#include "cache.h"
#include "run-command.h"
diff --git a/builtin-merge-base.c b/builtin-merge-base.c
index e35d362..0108e22 100644
--- a/builtin-merge-base.c
+++ b/builtin-merge-base.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "commit.h"
diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 10ec63b..58deb62 100644
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "xdiff/xdiff.h"
#include "xdiff-interface.h"
@@ -5,9 +6,9 @@
static const char merge_file_usage[] =
"git merge-file [-p | --stdout] [-q | --quiet] [-L name1 [-L orig [-L name2]]] file1 orig_file file2";
-int cmd_merge_file(int argc, char **argv, char **envp)
+int cmd_merge_file(int argc, const char **argv, const char *prefix)
{
- char *names[3];
+ const char *names[3];
mmfile_t mmfs[3];
mmbuffer_t result = {NULL, 0};
xpparam_t xpp = {XDF_NEED_MINIMAL};
@@ -51,7 +52,7 @@ int cmd_merge_file(int argc, char **argv, char **envp)
free(mmfs[i].ptr);
if (ret >= 0) {
- char *filename = argv[1];
+ const char *filename = argv[1];
FILE *f = to_stdout ? stdout : fopen(filename, "wb");
if (!f)
diff --git a/builtin-pack-refs.c b/builtin-pack-refs.c
index 7584992..09df4e1 100644
--- a/builtin-pack-refs.c
+++ b/builtin-pack-refs.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "object.h"
diff --git a/builtin-rerere.c b/builtin-rerere.c
index 6ffc43d..29d057c 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "path-list.h"
#include "xdiff/xdiff.h"
diff --git a/builtin-runstatus.c b/builtin-runstatus.c
index 4b489b1..2db25c8 100644
--- a/builtin-runstatus.c
+++ b/builtin-runstatus.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "wt-status.h"
diff --git a/builtin-show-ref.c b/builtin-show-ref.c
index 9463ff0..65051d1 100644
--- a/builtin-show-ref.c
+++ b/builtin-show-ref.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
#include "cache.h"
#include "refs.h"
#include "object.h"