[PATCH] commit: Remove backward goto in read_craft_line()
From: Ralf Thielow <hidden>
Date: 2016-06-15 22:50:08
Subsystem:
the rest · Maintainer:
Linus Torvalds
Bad graft data is noticed in several places in read_graft_line and in each case we go back to the first site of detection. Move the error handling to the end of the function for better readability. Signed-off-by: Ralf Thielow <redacted> --- commit.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/commit.c b/commit.c
index 0094ec1..642ee34 100644
--- a/commit.c
+++ b/commit.c@@ -137,12 +137,8 @@ struct commit_graft *read_graft_line(char *buf, int len) buf[--len] = '\0'; if (buf[0] == '#' || buf[0] == '\0') return NULL; - if ((len + 1) % 41) { - bad_graft_data: - error("bad graft data: %s", buf); - free(graft); - return NULL; - } + if ((len + 1) % 41) + goto bad_graft_data; i = (len + 1) / 41 - 1; graft = xmalloc(sizeof(*graft) + 20 * i); graft->nr_parent = i;
@@ -155,6 +151,10 @@ struct commit_graft *read_graft_line(char *buf, int len) goto bad_graft_data; } return graft; + bad_graft_data: + error("bad graft data: %s", buf); + free(graft); + return NULL; } static int read_graft_file(const char *graft_file)
--
1.7.1