config: drop cf validity check in get_next_char()

hvoigt · gitster · commit dbb9a8125542 · 2013-07-12T09:34:57.000-07:00
The global variable cf is set with an initialized value in all codepaths before
calling this function.

The complete call graph looks like this:

  git_config_from_file
    -&gt; do_config_from
      -&gt; git_parse_file
        -&gt; get_next_char
        -&gt; get_value
            -&gt; get_next_char
            -&gt; parse_value
                -&gt; get_next_char
        -&gt; get_base_var
            -&gt; get_next_char
            -&gt; get_extended_base_var
                -&gt; get_next_char

The variable is initialized in do_config_from.

Signed-off-by: Heiko Voigt &lt;hvoigt@hvoigt.net&gt;
Acked-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/config.c b/config.c
@@ -169,26 +169,23 @@ int git_config_from_parameters(config_fn_t fn, void *data)
 static int get_next_char(void)
 {
 	int c;
-	FILE *f;
+	FILE *f = cf->f;
 
-	c = '\n';
-	if (cf && ((f = cf->f) != NULL)) {
+	c = fgetc(f);
+	if (c == '\r') {
+		/* DOS like systems */
 		c = fgetc(f);
-		if (c == '\r') {
-			/* DOS like systems */
-			c = fgetc(f);
-			if (c != '\n') {
-				ungetc(c, f);
-				c = '\r';
-			}
-		}
-		if (c == '\n')
-			cf->linenr++;
-		if (c == EOF) {
-			cf->eof = 1;
-			c = '\n';
+		if (c != '\n') {
+			ungetc(c, f);
+			c = '\r';
 		}
 	}
+	if (c == '\n')
+		cf->linenr++;
+	if (c == EOF) {
+		cf->eof = 1;
+		c = '\n';
+	}
 	return c;
 }
 
