[PATCH] column: Fix some compiler and sparse warnings

[PATCH] column: Fix some compiler and sparse warnings

[Ramsay Jones]

Some versions of gcc complain as follows:

        CC column.o
    column.c: In function `git_config_column':
    column.c:313: warning: 'set' might be used uninitialized in \
        this function

The 'set' variable is not in fact used uninitialised, but in order to
suppress the warning, we rework the code slightly to ensure gcc does
not mis-diagnose the variable usage.

Also, sparse complains as follows:

        SP pager.c
    pager.c:134:5: warning: symbol 'term_columns' was not declared. \
        Should it be static?

In order to fix the warning, we add an include of the column.h header,
which contains an appropriate extern declaration of term_columns().

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

Hi Nguyen,

If you need to re-roll your "nd/columns" branch, could you please squash
this patch (or some variant) into it. Thanks!

[I haven't checked, but I'm guessing that the pager.c change would be
squashed into commit cb0850f (Save terminal width before setting up pager,
04-02-2012), whereas the column.c change would be squashed into commit
ac21f2b (Add git-column and column mode parsing, 04-02-2012)]

ATB,
Ramsay Jones

 column.c |    6 +++---
 pager.c  |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/column.c b/column.c
index f001021..98328cf 100644
--- a/column.c
+++ b/column.c
@@ -310,16 +310,16 @@ static int parse_option(const char *arg, int len,
 		{ OPTION, "color",  COL_ANSI },
 		{ OPTION, "dense",  COL_DENSE },
 	};
-	int i, set, name_len;
+	int i;
 
 	for (i = 0; i < ARRAY_SIZE(opts); i++) {
+		int set = 1, name_len;
+
 		if (opts[i].type == OPTION) {
 			if (len > 2 && !strncmp(arg, "no", 2)) {
 				arg += 2;
 				len -= 2;
 				set = 0;
-			} else {
-				set = 1;
 			}
 		}
 
diff --git a/pager.c b/pager.c
index 37d554d..fe203a7 100644
--- a/pager.c
+++ b/pager.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "run-command.h"
 #include "sigchain.h"
+#include "column.h"
 
 #ifndef DEFAULT_PAGER
 #define DEFAULT_PAGER "less"
-- 
1.7.9