{"thread":{"id":"11015","subject":"[Resend PATCH] Simplify the code and avoid an assignment","startedAt":"2007-11-25T21:42:31Z","lastAt":"2007-11-25T21:42:31Z","messageCount":1,"participants":["André Goddard Rosa"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"60873","messageId":"b8bf37780711251342j5c733a2du18f5d79a11df4b9f@mail.gmail.com","threadId":"11015","inReplyTo":null,"subject":"[Resend PATCH] Simplify the code and avoid an assignment","fromName":"André Goddard Rosa","fromEmail":"andre.goddard@gmail.com","sentAt":"2007-11-25T21:42:31Z","receivedAt":"2007-11-25T21:42:31Z","isPatch":true,"sender":{"key":"andre.goddard@gmail.com","avatar":null},"body":"Hi, all!\n\n     Simplify the code for easier understanding.\n\n>From cd0cc6995684e2801011910735146052e5b59ccc Mon Sep 17 00:00:00 2001\nFrom: Andre Goddard Rosa <andre.goddard@gmail.com>\nDate: Tue, 27 Nov 2007 10:22:46 -0200\nSubject: [PATCH] Simplify the code and avoid an assignment.\n\nSigned-off-by: Andre Goddard Rosa <andre.goddard@gmail.com>\n---\n config.c          |   19 ++++++++++---------\n mailmap.c         |    2 +-\n xdiff-interface.c |    2 +-\n 3 files changed, 12 insertions(+), 11 deletions(-)\n\ndiff --git a/config.c b/config.c\nindex 56e99fc..7c9fcdd 100644\n--- a/config.c\n+++ b/config.c\n@@ -447,15 +447,16 @@ int git_config_from_file(config_fn_t fn, const\nchar *filename)\n        int ret;\n        FILE *f = fopen(filename, \"r\");\n\n-       ret = -1;\n-       if (f) {\n-               config_file = f;\n-               config_file_name = filename;\n-               config_linenr = 1;\n-               ret = git_parse_file(fn);\n-               fclose(f);\n-               config_file_name = NULL;\n-       }\n+       if (!f)\n+               return -1;\n+\n+       config_file = f;\n+       config_file_name = filename;\n+       config_linenr = 1;\n+       ret = git_parse_file(fn);\n+       fclose(f);\n+       config_file_name = NULL;\n+\n        return ret;\n }\n\ndiff --git a/mailmap.c b/mailmap.c\nindex 8714167..0c13ecd 100644\n--- a/mailmap.c\n+++ b/mailmap.c\n@@ -7,7 +7,7 @@ int read_mailmap(struct path_list *map, const char\n*filename, char **repo_abbrev\n        char buffer[1024];\n        FILE *f = fopen(filename, \"r\");\n\n-       if (f == NULL)\n+       if (!f)\n                return 1;\n        while (fgets(buffer, sizeof(buffer), f) != NULL) {\n                char *end_of_name, *left_bracket, *right_bracket;\ndiff --git a/xdiff-interface.c b/xdiff-interface.c\nindex be866d1..9dd1f3b 100644\n--- a/xdiff-interface.c\n+++ b/xdiff-interface.c\n@@ -111,7 +111,7 @@ int read_mmfile(mmfile_t *ptr, const char *filename)\n\n        if (stat(filename, &st))\n                return error(\"Could not stat %s\", filename);\n-       if ((f = fopen(filename, \"rb\")) == NULL)\n+       if (!(f = fopen(filename, \"rb\")))\n                return error(\"Could not open %s\", filename);\n        sz = xsize_t(st.st_size);\n        ptr->ptr = xmalloc(sz);\n--\n1.5.3.6.861.gd794-dirty\n\n\nFrom cd0cc6995684e2801011910735146052e5b59ccc Mon Sep 17 00:00:00 2001\nFrom: Andre Goddard Rosa <andre.goddard@gmail.com>\nDate: Tue, 27 Nov 2007 10:22:46 -0200\nSubject: [PATCH] Simplify the code and avoid an assignment.\n\nSigned-off-by: Andre Goddard Rosa <andre.goddard@gmail.com>\n---\n config.c          |   19 ++++++++++---------\n mailmap.c         |    2 +-\n xdiff-interface.c |    2 +-\n 3 files changed, 12 insertions(+), 11 deletions(-)\n\ndiff --git a/config.c b/config.c\nindex 56e99fc..7c9fcdd 100644\n--- a/config.c\n+++ b/config.c\n@@ -447,15 +447,16 @@ int git_config_from_file(config_fn_t fn, const char *filename)\n \tint ret;\n \tFILE *f = fopen(filename, \"r\");\n \n-\tret = -1;\n-\tif (f) {\n-\t\tconfig_file = f;\n-\t\tconfig_file_name = filename;\n-\t\tconfig_linenr = 1;\n-\t\tret = git_parse_file(fn);\n-\t\tfclose(f);\n-\t\tconfig_file_name = NULL;\n-\t}\n+\tif (!f)\n+\t\treturn -1;\n+\n+\tconfig_file = f;\n+\tconfig_file_name = filename;\n+\tconfig_linenr = 1;\n+\tret = git_parse_file(fn);\n+\tfclose(f);\n+\tconfig_file_name = NULL;\n+\n \treturn ret;\n }\n \ndiff --git a/mailmap.c b/mailmap.c\nindex 8714167..0c13ecd 100644\n--- a/mailmap.c\n+++ b/mailmap.c\n@@ -7,7 +7,7 @@ int read_mailmap(struct path_list *map, const char *filename, char **repo_abbrev\n \tchar buffer[1024];\n \tFILE *f = fopen(filename, \"r\");\n \n-\tif (f == NULL)\n+\tif (!f)\n \t\treturn 1;\n \twhile (fgets(buffer, sizeof(buffer), f) != NULL) {\n \t\tchar *end_of_name, *left_bracket, *right_bracket;\ndiff --git a/xdiff-interface.c b/xdiff-interface.c\nindex be866d1..9dd1f3b 100644\n--- a/xdiff-interface.c\n+++ b/xdiff-interface.c\n@@ -111,7 +111,7 @@ int read_mmfile(mmfile_t *ptr, const char *filename)\n \n \tif (stat(filename, &st))\n \t\treturn error(\"Could not stat %s\", filename);\n-\tif ((f = fopen(filename, \"rb\")) == NULL)\n+\tif (!(f = fopen(filename, \"rb\")))\n \t\treturn error(\"Could not open %s\", filename);\n \tsz = xsize_t(st.st_size);\n \tptr->ptr = xmalloc(sz);\n-- \n1.5.3.6.861.gd794-dirty\n\n"}]}