Commit 85023577 authored by Junio C Hamano's avatar Junio C Hamano

simplify inclusion of system header files.

This is a mechanical clean-up of the way *.c files include
system header files.

 (1) sources under compat/, platform sha-1 implementations, and
     xdelta code are exempt from the following rules;

 (2) the first #include must be "git-compat-util.h" or one of
     our own header file that includes it first (e.g. config.h,
     builtin.h, pkt-line.h);

 (3) system headers that are included in "git-compat-util.h"
     need not be included in individual C source files.

 (4) "git-compat-util.h" does not have to include subsystem
     specific header files (e.g. expat.h).
Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
parent 6d2fa7f1
/*
* Copyright (c) 2005, 2006 Rene Scharfe
*/
#include <time.h>
#include "cache.h"
#include "commit.h"
#include "strbuf.h"
......
/*
* Copyright (c) 2006 Rene Scharfe
*/
#include <time.h>
#include "cache.h"
#include "commit.h"
#include "blob.h"
......
#include "cache.h"
#include "blob.h"
#include <stdlib.h>
const char *blob_type = "blob";
......
......@@ -3,8 +3,6 @@
*
* Copyright (C) 2006 Linus Torvalds
*/
#include <fnmatch.h>
#include "cache.h"
#include "builtin.h"
#include "dir.h"
......
......@@ -6,7 +6,6 @@
* This applies patches on top of some (arbitrary) version of the SCM.
*
*/
#include <fnmatch.h>
#include "cache.h"
#include "cache-tree.h"
#include "quote.h"
......
......@@ -2,7 +2,6 @@
* Copyright (c) 2006 Franck Bui-Huu
* Copyright (c) 2006 Rene Scharfe
*/
#include <time.h>
#include "cache.h"
#include "builtin.h"
#include "archive.h"
......
......@@ -15,10 +15,6 @@
#include "revision.h"
#include "xdiff-interface.h"
#include <time.h>
#include <sys/time.h>
#include <regex.h>
static char blame_usage[] =
"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [commit] [--] file\n"
" -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
......
......@@ -5,8 +5,8 @@
* Based on git-branch.sh by Junio C Hamano.
*/
#include "color.h"
#include "cache.h"
#include "color.h"
#include "refs.h"
#include "commit.h"
#include "builtin.h"
......
......@@ -6,7 +6,6 @@
#include "tree.h"
#include "blob.h"
#include "quote.h"
#include <fnmatch.h>
/* Quoting styles */
#define QUOTE_NONE 0
......
......@@ -10,10 +10,7 @@
#include "tag.h"
#include "tree-walk.h"
#include "builtin.h"
#include <regex.h>
#include "grep.h"
#include <fnmatch.h>
#include <sys/wait.h>
/*
* git grep pathspecs are somewhat different from diff-tree pathspecs;
......
......@@ -11,8 +11,6 @@
#include "log-tree.h"
#include "builtin.h"
#include "tag.h"
#include <time.h>
#include <sys/time.h>
static int default_show_root = 1;
......
......@@ -5,8 +5,6 @@
*
* Copyright (C) Linus Torvalds, 2005
*/
#include <fnmatch.h>
#include "cache.h"
#include "quote.h"
#include "dir.h"
......
......@@ -2,15 +2,6 @@
* Another stupid program, this one parsing the headers of an
* email to figure out authorship and subject
*/
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#ifndef NO_ICONV
#include <iconv.h>
#endif
#include "git-compat-util.h"
#include "cache.h"
#include "builtin.h"
......
......@@ -4,13 +4,6 @@
* It just splits a mbox into a list of files: "0001" "0002" ..
* so you can process them further from there.
*/
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#include <stdio.h>
#include "cache.h"
#include "builtin.h"
......
......@@ -3,8 +3,6 @@
*
* Copyright (C) 2006 Johannes Schindelin
*/
#include <fnmatch.h>
#include "cache.h"
#include "builtin.h"
#include "dir.h"
......
#include <stdlib.h>
#include "builtin.h"
#include "cache.h"
#include "commit.h"
......
......@@ -12,8 +12,6 @@
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
#include <sys/time.h>
#include <signal.h>
static const char pack_usage[] = "\
git-pack-objects [{ -q | --progress | --all-progress }] \n\
......
#include "builtin.h"
#include "cache.h"
#include <regex.h>
static const char git_config_set_usage[] =
"git-repo-config [ --global ] [ --bool | --int ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --list";
......
#include "wt-status.h"
#include "cache.h"
#include "wt-status.h"
extern int wt_status_use_color;
......
......@@ -4,7 +4,6 @@
#include "diff.h"
#include "path-list.h"
#include "revision.h"
#include <string.h>
static const char shortlog_usage[] =
"git-shortlog [-n] [-s] [<commit-id>... ]";
......
#include <stdlib.h>
#include <fnmatch.h>
#include "cache.h"
#include "commit.h"
#include "refs.h"
......
#include <stdio.h>
#include <string.h>
#include <ctype.h>
#include "builtin.h"
/*
......
/*
* Copyright (c) 2005, 2006 Rene Scharfe
*/
#include <time.h>
#include "cache.h"
#include "commit.h"
#include "tar.h"
......
......@@ -8,8 +8,6 @@
#include "tag.h"
#include "tree.h"
#include <sys/time.h>
static int dry_run, quiet, recover, has_errors;
static const char unpack_usage[] = "git-unpack-objects [-n] [-q] [-r] < pack-file";
......
/*
* Copyright (c) 2006 Franck Bui-Huu
*/
#include <time.h>
#include <sys/wait.h>
#include <sys/poll.h>
#include "cache.h"
#include "builtin.h"
#include "archive.h"
......
#include "color.h"
#include "cache.h"
#include "git-compat-util.h"
#include <stdarg.h>
#include "color.h"
#define COLOR_RESET "\033[m"
......
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
#include "../git-compat-util.h"
void *gitfakemmap(void *start, size_t length, int prot , int flags, int fd, off_t offset)
......
#include <stdlib.h>
#include <string.h>
#include "../git-compat-util.h"
int gitsetenv(const char *name, const char *value, int replace)
{
......
#include <string.h>
#include "../git-compat-util.h"
size_t gitstrlcpy(char *dest, const char *src, size_t size)
{
......
#include <stdlib.h>
#include <string.h>
#include "../git-compat-util.h"
void gitunsetenv (const char *name)
{
......
......@@ -6,7 +6,6 @@
*
*/
#include "cache.h"
#include <regex.h>
#define MAXNAME (256)
......
......@@ -3,12 +3,6 @@
#include "pkt-line.h"
#include "quote.h"
#include "refs.h"
#include <sys/wait.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <signal.h>
static char *server_capabilities;
......
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#define _GNU_SOURCE
#include <time.h>
#include "cache.h"
#include "blob.h"
#include "commit.h"
......
#include <signal.h>
#include <sys/wait.h>
#include <sys/socket.h>
#include <sys/time.h>
#include <sys/poll.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <syslog.h>
#include <pwd.h>
#include <grp.h>
#include <limits.h>
#include "pkt-line.h"
#include "cache.h"
#include "pkt-line.h"
#include "exec_cmd.h"
#include "interpolate.h"
#include <syslog.h>
#ifndef HOST_NAME_MAX
#define HOST_NAME_MAX 256
#endif
......
......@@ -4,9 +4,6 @@
* Copyright (C) Linus Torvalds, 2005
*/
#include <time.h>
#include <sys/time.h>
#include "cache.h"
static time_t my_mktime(struct tm *tm)
......
......@@ -18,11 +18,8 @@
* licensing gets turned into GPLv2 within this project.
*/
#include <stdlib.h>
#include <string.h>
#include "delta.h"
#include "git-compat-util.h"
#include "delta.h"
/* maximum hash entry list for the same hash bucket */
#define HASH_LIMIT 64
......
/*
* Copyright (C) 2005 Junio C Hamano
*/
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
#include "cache.h"
#include "quote.h"
#include "diff.h"
......
......@@ -4,7 +4,6 @@
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
#include <fnmatch.h>
static char **order;
static int order_cnt;
......
......@@ -5,8 +5,6 @@
#include "diff.h"
#include "diffcore.h"
#include <regex.h>
static unsigned int contains(struct diff_filespec *one,
const char *needle, unsigned long len,
regex_t *regexp)
......
......@@ -5,9 +5,6 @@
* Copyright (C) Linus Torvalds, 2005-2006
* Junio Hamano, 2005-2006
*/
#include <dirent.h>
#include <fnmatch.h>
#include "cache.h"
#include "dir.h"
......
#include <sys/types.h>
#include <dirent.h>
#include "cache.h"
#include "blob.h"
......
......@@ -5,7 +5,6 @@
#include "tag.h"
#include "exec_cmd.h"
#include "sideband.h"
#include <sys/wait.h>
static int keep_pack;
static int quiet;
......
#include "fetch.h"
#include "cache.h"
#include "fetch.h"
#include "commit.h"
#include "tree.h"
#include "tree-walk.h"
......
#include <sys/types.h>
#include <dirent.h>
#include "cache.h"
#include "commit.h"
#include "tree.h"
......
......@@ -11,6 +11,11 @@
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
#define _XOPEN_SOURCE 600 /* glibc2 and AIX 5.3L need 500, OpenBSD needs 600 for S_ISLNK() */
#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
#define _GNU_SOURCE
#define _BSD_SOURCE
#include <unistd.h>
#include <stdio.h>
#include <sys/stat.h>
......@@ -22,9 +27,27 @@
#include <errno.h>
#include <limits.h>
#include <sys/param.h>
#include <netinet/in.h>
#include <sys/types.h>
#include <dirent.h>
#include <sys/time.h>
#include <time.h>
#include <signal.h>
#include <sys/wait.h>
#include <fnmatch.h>
#include <sys/poll.h>
#include <sys/socket.h>
#include <assert.h>
#include <regex.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <pwd.h>
#include <grp.h>
#ifndef NO_ICONV
#include <iconv.h>
#endif
/* On most systems <limits.h> would have given us this, but
* not on some systems (e.g. GNU/Hurd).
......
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
#include "git-compat-util.h"
#include "builtin.h"
#include "exec_cmd.h"
#include "cache.h"
#include "quote.h"
#include "builtin.h"
const char git_usage_string[] =
"git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] [--bare] [--git-dir=GIT_DIR] [--help] COMMAND [ARGS]";
......
#include "cache.h"
#include <regex.h>
#include "grep.h"
void append_grep_pattern(struct grep_opt *opt, const char *pat,
......
......@@ -3,12 +3,11 @@
*
* Builtin help-related commands (help, usage, version)
*/
#include <sys/ioctl.h>
#include "cache.h"
#include "builtin.h"
#include "exec_cmd.h"
#include "common-cmds.h"
#include <sys/ioctl.h>
/* most GUI terminals set COLUMNS (although some don't export it) */
static int term_columns(void)
......
......@@ -7,9 +7,6 @@
*/
#include "cache.h"
#include <pwd.h>
#include <netdb.h>
static char git_default_date[50];
static void copy_gecos(struct passwd *w, char *name, int sz)
......
......@@ -24,13 +24,6 @@
#include "cache.h"
#include <assert.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netdb.h>
typedef struct store_conf {
char *name;
const char *path; /* should this be here? its interpretation is driver-specific */
......
#define _XOPEN_SOURCE 600
#include <unistd.h>
#include <sys/time.h>
#include <signal.h>
#include "cache.h"
#include "delta.h"
#include "pack.h"
......
......@@ -2,8 +2,6 @@
* Copyright 2006 Jon Loeliger
*/
#include <string.h>
#include "git-compat-util.h"
#include "interpolate.h"
......
/*
* Copyright (c) 2005, Junio C Hamano
*/
#include <signal.h>
#include "cache.h"
static struct lock_file *lock_file_list;
......
#include <stdlib.h>
#include "cache.h"
#include "commit.h"
......
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
#include "cache.h"
static const char *pgm;
......
......@@ -3,13 +3,6 @@
* Fredrik Kuivinen.
* The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
*/
#include <stdarg.h>
#include <string.h>
#include <assert.h>
#include <sys/wait.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <time.h>
#include "cache.h"
#include "cache-tree.h"
#include "commit.h"
......
#include <stdio.h>
#include "cache.h"
#include "path-list.h"
......
......@@ -11,7 +11,6 @@
* which is what it's designed for.
*/
#include "cache.h"
#include <pwd.h>
static char bad_path[] = "/bad-path/";
......
......@@ -6,7 +6,6 @@
#include "exec_cmd.h"
#include "commit.h"
#include "object.h"
#include <sys/wait.h>
static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
......
#include "refs.h"
#include "cache.h"
#include "refs.h"
#include "object.h"
#include "tag.h"
#include <errno.h>
/* ISSYMREF=01 and ISPACKED=02 are public interfaces */
#define REF_KNOWS_PEELED 04
......
......@@ -6,7 +6,6 @@
#include "diff.h"
#include "refs.h"
#include "revision.h"
#include <regex.h>
#include "grep.h"
static char *path_name(struct name_path *path, const char *name)
......
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include "cache.h"
#include "rsh.h"
#include "quote.h"
#include "cache.h"
#define COMMAND_SIZE 4096
......
#include "cache.h"
#include "run-command.h"
#include <sys/wait.h>
#include "exec_cmd.h"
int run_command_v_opt(int argc, const char **argv, int flags)
......
......@@ -12,8 +12,6 @@
#include "rsh.h"
#include "refs.h"
#include <string.h>
static unsigned char local_version = 1;
static unsigned char remote_version;
......
#include <stdio.h>
#include <stdlib.h>
#include "strbuf.h"
#include "cache.h"
#include "strbuf.h"
void strbuf_init(struct strbuf *sb) {
sb->buf = NULL;
......
#include <stdio.h>
#include <time.h>
#include "cache.h"
int main(int argc, char **argv)
......
......@@ -8,13 +8,7 @@
* published by the Free Software Foundation.
*/
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
#include "git-compat-util.h"
#include "delta.h"
static const char usage[] =
......
......@@ -4,7 +4,6 @@
#include "commit.h"
#include "tag.h"
#include "tree-walk.h"
#include <stdlib.h>
const char *tree_type = "tree";
......
#include <signal.h>
#include <sys/time.h>
#include "cache.h"
#include "dir.h"
#include "tree.h"
......
#include <signal.h>
#include <sys/wait.h>
#include <sys/poll.h>
#include "cache.h"
#include "refs.h"
#include "pkt-line.h"
......
......@@ -4,9 +4,6 @@
* Copyright (C) Eric Biederman, 2005
*/
#include "cache.h"
#include <stdio.h>
#include <errno.h>
#include <string.h>
static const char var_usage[] = "git-var [-l | <variable>]";
......
#include "cache.h"
#include "wt-status.h"
#include "color.h"
#include "cache.h"
#include "object.h"
#include "dir.h"
#include "commit.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment