aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar John Keeping <john@keeping.me.uk>2013-04-06 19:37:59 (JST)
committerGravatar Jason A. Donenfeld <Jason@zx2c4.com>2013-04-08 22:45:34 (JST)
commit8f208794318f83826e98168b8b430f2d9a68bcce (patch)
treeb8e2b81f4899e75eda3666cba24ac3dc06daf151
parenta5e4ad2d8b9c6bcfc7029894d3a3837166996b35 (diff)
downloadcgit-8f208794318f83826e98168b8b430f2d9a68bcce.zip
cgit-8f208794318f83826e98168b8b430f2d9a68bcce.tar.gz
Always #include corresponding .h in .c files
While doing this, remove declarations from header files where the corresponding definition is declared "static" in order to avoid build errors. Also re-order existing headers in ui-*.c so that the file-specific header always comes immediately after "cgit.h", helping with future consistency. Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--html.c1
-rw-r--r--html.h2
-rw-r--r--scan-tree.c1
-rw-r--r--ui-atom.c1
-rw-r--r--ui-blob.c1
-rw-r--r--ui-clone.c1
-rw-r--r--ui-commit.c1
-rw-r--r--ui-diff.c1
-rw-r--r--ui-diff.h3
-rw-r--r--ui-log.c1
-rw-r--r--ui-patch.c1
-rw-r--r--ui-plain.c1
-rw-r--r--ui-refs.c1
-rw-r--r--ui-repolist.c1
-rw-r--r--ui-shared.c1
-rw-r--r--ui-shared.h2
-rw-r--r--ui-snapshot.c1
-rw-r--r--ui-ssdiff.c2
-rw-r--r--ui-stats.c2
-rw-r--r--ui-summary.c1
-rw-r--r--ui-tag.c1
-rw-r--r--ui-tree.c1
22 files changed, 20 insertions, 8 deletions
diff --git a/html.c b/html.c
index d60a41f..1104f97 100644
--- a/html.c
+++ b/html.c
@@ -6,6 +6,7 @@
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "html.h"
9#include <unistd.h> 10#include <unistd.h>
10#include <stdio.h> 11#include <stdio.h>
11#include <stdlib.h> 12#include <stdlib.h>
diff --git a/html.h b/html.h
index 20e1dc2..bb36f37 100644
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
1#ifndef HTML_H 1#ifndef HTML_H
2#define HTML_H 2#define HTML_H
3 3
4extern int htmlfd; 4#include <stddef.h>
5 5
6extern void html_raw(const char *txt, size_t size); 6extern void html_raw(const char *txt, size_t size);
7extern void html(const char *txt); 7extern void html(const char *txt);
diff --git a/scan-tree.c b/scan-tree.c
index 10d90f4..0d3e0ad 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -8,6 +8,7 @@
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "scan-tree.h"
11#include "configfile.h" 12#include "configfile.h"
12#include "html.h" 13#include "html.h"
13 14
diff --git a/ui-atom.c b/ui-atom.c
index 1554088..2a1eb59 100644
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "ui-atom.h"
10#include "html.h" 11#include "html.h"
11#include "ui-shared.h" 12#include "ui-shared.h"
12 13
diff --git a/ui-blob.c b/ui-blob.c
index 7aec0b1..1da43c8 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -8,6 +8,7 @@
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "ui-blob.h"
11#include "html.h" 12#include "html.h"
12#include "ui-shared.h" 13#include "ui-shared.h"
13 14
diff --git a/ui-clone.c b/ui-clone.c
index fdea24f..30d020e 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -8,6 +8,7 @@
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "ui-clone.h"
11#include "html.h" 12#include "html.h"
12#include "ui-shared.h" 13#include "ui-shared.h"
13 14
diff --git a/ui-commit.c b/ui-commit.c
index 5a552a1..8310ce6 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "ui-commit.h"
10#include "html.h" 11#include "html.h"
11#include "ui-shared.h" 12#include "ui-shared.h"
12#include "ui-diff.h" 13#include "ui-diff.h"
diff --git a/ui-diff.c b/ui-diff.c
index 7de7802..1115518 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "ui-diff.h"
10#include "html.h" 11#include "html.h"
11#include "ui-shared.h" 12#include "ui-shared.h"
12#include "ui-ssdiff.h" 13#include "ui-ssdiff.h"
diff --git a/ui-diff.h b/ui-diff.h
index 0161ffb..25a9296 100644
--- a/ui-diff.h
+++ b/ui-diff.h
@@ -3,9 +3,6 @@
3 3
4extern void cgit_print_diff_ctrls(); 4extern void cgit_print_diff_ctrls();
5 5
6extern void cgit_print_diffstat(const unsigned char *old_sha1,
7 const unsigned char *new_sha1);
8
9extern void cgit_print_diff(const char *new_hex, const char *old_hex, 6extern void cgit_print_diff(const char *new_hex, const char *old_hex,
10 const char *prefix, int show_ctrls); 7 const char *prefix, int show_ctrls);
11 8
diff --git a/ui-log.c b/ui-log.c
index 8d8b235..8592843 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "ui-log.h"
10#include "html.h" 11#include "html.h"
11#include "ui-shared.h" 12#include "ui-shared.h"
12#include "vector.h" 13#include "vector.h"
diff --git a/ui-patch.c b/ui-patch.c
index 12abe10..66def3c 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "ui-patch.h"
10#include "html.h" 11#include "html.h"
11#include "ui-shared.h" 12#include "ui-shared.h"
12 13
diff --git a/ui-plain.c b/ui-plain.c
index 8ef4ec6..4397a59 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -8,6 +8,7 @@
8 8
9#include <stdio.h> 9#include <stdio.h>
10#include "cgit.h" 10#include "cgit.h"
11#include "ui-plain.h"
11#include "html.h" 12#include "html.h"
12#include "ui-shared.h" 13#include "ui-shared.h"
13 14
diff --git a/ui-refs.c b/ui-refs.c
index 45db2ac..5bebed1 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "ui-refs.h"
10#include "html.h" 11#include "html.h"
11#include "ui-shared.h" 12#include "ui-shared.h"
12 13
diff --git a/ui-repolist.c b/ui-repolist.c
index a9751f6..76fe71a 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -8,6 +8,7 @@
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "ui-repolist.h"
11#include "html.h" 12#include "html.h"
12#include "ui-shared.h" 13#include "ui-shared.h"
13#include <strings.h> 14#include <strings.h>
diff --git a/ui-shared.c b/ui-shared.c
index 7a726c1..945d560 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "ui-shared.h"
10#include "cmd.h" 11#include "cmd.h"
11#include "html.h" 12#include "html.h"
12 13
diff --git a/ui-shared.h b/ui-shared.h
index 0666388..5f8b629 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -47,8 +47,6 @@ extern void cgit_diff_link(const char *name, const char *title,
47extern void cgit_stats_link(const char *name, const char *title, 47extern void cgit_stats_link(const char *name, const char *title,
48 const char *class, const char *head, 48 const char *class, const char *head,
49 const char *path); 49 const char *path);
50extern void cgit_self_link(char *name, const char *title,
51 const char *class, struct cgit_context *ctx);
52extern void cgit_object_link(struct object *obj); 50extern void cgit_object_link(struct object *obj);
53 51
54extern void cgit_submodule_link(const char *class, char *path, 52extern void cgit_submodule_link(const char *class, char *path,
diff --git a/ui-snapshot.c b/ui-snapshot.c
index e199a92..9be5dbe 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,6 +8,7 @@
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "ui-snapshot.h"
11#include "html.h" 12#include "html.h"
12#include "ui-shared.h" 13#include "ui-shared.h"
13 14
diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 3d3dad6..cbe60bd 100644
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -1,8 +1,8 @@
1#include "cgit.h" 1#include "cgit.h"
2#include "ui-ssdiff.h"
2#include "html.h" 3#include "html.h"
3#include "ui-shared.h" 4#include "ui-shared.h"
4#include "ui-diff.h" 5#include "ui-diff.h"
5#include "ui-ssdiff.h"
6 6
7extern int use_ssdiff; 7extern int use_ssdiff;
8 8
diff --git a/ui-stats.c b/ui-stats.c
index 480c8ee..52e9b91 100644
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,7 +1,7 @@
1#include "cgit.h" 1#include "cgit.h"
2#include "ui-stats.h"
2#include "html.h" 3#include "html.h"
3#include "ui-shared.h" 4#include "ui-shared.h"
4#include "ui-stats.h"
5 5
6#ifdef NO_C99_FORMAT 6#ifdef NO_C99_FORMAT
7#define SZ_FMT "%u" 7#define SZ_FMT "%u"
diff --git a/ui-summary.c b/ui-summary.c
index 0754bb7..bd123ef 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,6 +8,7 @@
8 */ 8 */
9 9
10#include "cgit.h" 10#include "cgit.h"
11#include "ui-summary.h"
11#include "html.h" 12#include "html.h"
12#include "ui-log.h" 13#include "ui-log.h"
13#include "ui-refs.h" 14#include "ui-refs.h"
diff --git a/ui-tag.c b/ui-tag.c
index 4d340d4..5a22696 100644
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -7,6 +7,7 @@
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "ui-tag.h"
10#include "html.h" 11#include "html.h"
11#include "ui-shared.h" 12#include "ui-shared.h"
12 13
diff --git a/ui-tree.c b/ui-tree.c
index b692b56..d713553 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -8,6 +8,7 @@
8 8
9#include <ctype.h> 9#include <ctype.h>
10#include "cgit.h" 10#include "cgit.h"
11#include "ui-tree.h"
11#include "html.h" 12#include "html.h"
12#include "ui-shared.h" 13#include "ui-shared.h"
13 14