Re: [PATCH] Simplify the code and avoid an attribution.
flat view
From: Mike Hommey <hidden>
Date: 2016-06-15 22:43:53
On Wed, Nov 21, 2007 at 11:00:02PM -0200, André Goddard Rosa wrote:
quoted hunk ↗ jump to hunk
--- a/config.c +++ b/config.c@@ -447,15 +447,16 @@ int git_config_from_file(config_fn_t fn, constchar *filename) int ret; FILE *f = fopen(filename, "r"); - ret = -1; - if (f) { - config_file = f; - config_file_name = filename; - config_linenr = 1; - ret = git_parse_file(fn); - fclose(f); - config_file_name = NULL; - } + if (!f) + return -1; + + config_file = f; + config_file_name = filename; + config_linenr = 1; + ret = git_parse_file(fn); + fclose(f); + config_file_name = NULL; + return ret; }
Actually, since it is more likely that the file has been opened, the original code is more optimal because it doesn't generate a jump in most cases. And if you're worried about the ret variable, don't worry, it's most likely stripped out by the compiler optimizations.
- if (f == NULL) + if (!f)
- if ((f = fopen(filename, "rb")) == NULL) + if (!(f = fopen(filename, "rb")))
It's a matter of taste Mike