aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-07-08 14:34:02 -0400
committerJunio C Hamano <junkio@cox.net>2006-07-10 00:13:28 -0700
commit344c52aee5f2dfaad2a065f8dcc8566d52d0d6c9 (patch)
treeb17a624f0ca2ea52753397ee588a05b63428d612
parent4f12d529abbf233e1df93e7ffa5f2719005a2258 (diff)
downloadgit-344c52aee5f2dfaad2a065f8dcc8566d52d0d6c9.tar.gz
git-344c52aee5f2dfaad2a065f8dcc8566d52d0d6c9.tar.xz
Avoid C99 initializers
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>
-rw-r--r--builtin-read-tree.c18
-rw-r--r--checkout-index.c10
-rw-r--r--diff.c12
3 files changed, 16 insertions, 24 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 23a8d92a4..6df5d7c5c 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -43,10 +43,7 @@ struct tree_entry_list {
const unsigned char *sha1;
};
-static struct tree_entry_list df_conflict_list = {
- .name = NULL,
- .next = &df_conflict_list
-};
+static struct tree_entry_list df_conflict_list;
typedef int (*merge_fn_t)(struct cache_entry **src);
@@ -333,14 +330,9 @@ static void setup_progress_signal(void)
setitimer(ITIMER_REAL, &v, NULL);
}
+static struct checkout state;
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 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];
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();
git_config(git_default_config);
diff --git a/checkout-index.c b/checkout-index.c
index 292795550..61152f34b 100644
--- a/checkout-index.c
+++ b/checkout-index.c
@@ -49,14 +49,7 @@ static int checkout_stage; /* default to checkout stage0 */
static int to_tempfile;
static char topath[4][MAXPATHLEN+1];
-static struct checkout state = {
- .base_dir = "",
- .base_dir_len = 0,
- .force = 0,
- .quiet = 0,
- .not_new = 0,
- .refresh_cache = 0,
-};
+static struct checkout state;
static void write_tempfile_record (const char *name)
{
@@ -177,6 +170,7 @@ int main(int argc, char **argv)
int all = 0;
int read_from_stdin = 0;
+ state.base_dir = "";
prefix = setup_git_directory();
git_config(git_default_config);
prefix_length = prefix ? strlen(prefix) : 0;
diff --git a/diff.c b/diff.c
index e101bfd8c..287a927ce 100644
--- a/diff.c
+++ b/diff.c
@@ -44,12 +44,12 @@ enum color_diff {
#define COLOR_WHITE "\033[37m"
static const char *diff_colors[] = {
- [DIFF_RESET] = COLOR_RESET,
- [DIFF_PLAIN] = COLOR_NORMAL,
- [DIFF_METAINFO] = COLOR_BOLD,
- [DIFF_FRAGINFO] = COLOR_CYAN,
- [DIFF_FILE_OLD] = COLOR_RED,
- [DIFF_FILE_NEW] = COLOR_GREEN,
+ COLOR_RESET,
+ COLOR_NORMAL,
+ COLOR_BOLD,
+ COLOR_CYAN,
+ COLOR_RED,
+ COLOR_GREEN
};
static int parse_diff_color_slot(const char *var, int ofs)