undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid C99 initializers

Browse Source 
In a handful places, we use C99 structure and array
initializers, which some compilers do not support.

This can be handy when you are trying to compile GIT on a
Solaris system that has an older C compiler, for example.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn Pearce 2006-07-08 14:34:02 -04:00 committed by Junio C Hamano
parent 4f12d529ab
commit 344c52aee5
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin-read-tree.c
View File

@ -43,10 +43,7 @@ struct tree_entry_list {
const unsigned char *sha1; const unsigned char *sha1;
}; };
static struct tree_entry_list df_conflict_list = { static struct tree_entry_list df_conflict_list;
.name = NULL,
.next = &df_conflict_list
};
typedef int (*merge_fn_t)(struct cache_entry **src); typedef int (*merge_fn_t)(struct cache_entry **src);
@ -333,14 +330,9 @@ static void setup_progress_signal(void)
setitimer(ITIMER_REAL, &v, NULL); setitimer(ITIMER_REAL, &v, NULL);
} }
static struct checkout state;
static void check_updates(struct cache_entry **src, int nr) static void check_updates(struct cache_entry **src, int nr)
{ {
static struct checkout state = {
.base_dir = "",
.force = 1,
.quiet = 1,
.refresh_cache = 1,
};
unsigned short mask = htons(CE_UPDATE); unsigned short mask = htons(CE_UPDATE);
unsigned last_percent = 200, cnt = 0, total = 0; unsigned last_percent = 200, cnt = 0, total = 0;
@ -884,6 +876,12 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
unsigned char sha1[20]; unsigned char sha1[20];
merge_fn_t fn = NULL; merge_fn_t fn = NULL;
df_conflict_list.next = &df_conflict_list;
state.base_dir = "";
state.force = 1;
state.quiet = 1;
state.refresh_cache = 1;
setup_git_directory(); setup_git_directory();
git_config(git_default_config); git_config(git_default_config);

10
checkout-index.c
View File

@ -49,14 +49,7 @@ static int checkout_stage; /* default to checkout stage0 */
static int to_tempfile; static int to_tempfile;
static char topath[4][MAXPATHLEN+1]; static char topath[4][MAXPATHLEN+1];
static struct checkout state = { static struct checkout state;
.base_dir = "",
.base_dir_len = 0,
.force = 0,
.quiet = 0,
.not_new = 0,
.refresh_cache = 0,
};
static void write_tempfile_record (const char *name) static void write_tempfile_record (const char *name)
{ {
@ -177,6 +170,7 @@ int main(int argc, char **argv)
int all = 0; int all = 0;
int read_from_stdin = 0; int read_from_stdin = 0;
state.base_dir = "";
prefix = setup_git_directory(); prefix = setup_git_directory();
git_config(git_default_config); git_config(git_default_config);
prefix_length = prefix ? strlen(prefix) : 0; prefix_length = prefix ? strlen(prefix) : 0;

12
diff.c
View File

@ -44,12 +44,12 @@ enum color_diff {
#define COLOR_WHITE "\033[37m" #define COLOR_WHITE "\033[37m"
static const char *diff_colors[] = { static const char *diff_colors[] = {
[DIFF_RESET] = COLOR_RESET, COLOR_RESET,
[DIFF_PLAIN] = COLOR_NORMAL, COLOR_NORMAL,
[DIFF_METAINFO] = COLOR_BOLD, COLOR_BOLD,
[DIFF_FRAGINFO] = COLOR_CYAN, COLOR_CYAN,
[DIFF_FILE_OLD] = COLOR_RED, COLOR_RED,
[DIFF_FILE_NEW] = COLOR_GREEN, COLOR_GREEN
}; };
static int parse_diff_color_slot(const char *var, int ofs) static int parse_diff_color_slot(const char *var, int ofs)