[PATCH 09/14] merge-recursive.c: Initialise variable to suppress msvc warning

Ramsay Jones· Dec 4, 2010, 19:08 UTC · lore

The msvc compiler thinks a variable could be used while uninitialised and issues the following warning:

    ...\git\merge-recursive.c(1599) : warning C4700: uninitialized local \
        variable 'mrtree' used

In order to suppress the warning we simply initialise the mrtree pointer variable to NULL.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---
 merge-recursive.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to merge-recursive.c +1 −1

diff --git a/merge-recursive.c b/merge-recursive.c
index 16c2dbe..d5423ad 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1596,7 +1596,7 @@ int merge_recursive(struct merge_options *o,
 {
 	struct commit_list *iter;
 	struct commit *merged_common_ancestors;
-	struct tree *mrtree = mrtree;
+	struct tree *mrtree = NULL;
 	int clean;
 
 	if (show(o, 4)) {

-- 
1.7.3

patch, 14 partsmerge-recursive.c: Initialise variable to suppress msvc warning