From: Florian Forster <octo@verplant.org>
Date: Sun, 18 Jun 2006 15:18:07 +0000 (+0200)
Subject: Don't use empty structure initializers.
X-Git-Tag: v1.4.1-rc1~7^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=571ea603a6464cab86dad2d470034e0f3b6e67df;p=git.git

Don't use empty structure initializers.

Empty initializers for structures are not allowed in ANSI C99. This patch
removes such an initializer from `builtin-read-tree.c'. Since the struct was
static (and is therefore implicitely initialized to zero anyway) it wasn't
actually needed.

Signed-off-by: Florian Forster <octo@verplant.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 04506da89..9a2099d73 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -31,8 +31,7 @@ static int merge_size = 0;
 
 static struct object_list *trees = NULL;
 
-static struct cache_entry df_conflict_entry = {
-};
+static struct cache_entry df_conflict_entry;
 
 struct tree_entry_list {
 	struct tree_entry_list *next;