From 80d74ea732b31f0a5eba5e2569f832388a95c0f4 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 31 Jan 2018 04:02:18 +0000 Subject: io.c: simplified pipe_del_fptr * io.c (pipe_del_fptr): merged code for the case fptr is first to the loop for the rest. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62120 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index dde980880c..6bcce27bb7 100644 --- a/io.c +++ b/io.c @@ -6150,23 +6150,16 @@ pipe_add_fptr(rb_io_t *fptr) static void pipe_del_fptr(rb_io_t *fptr) { - struct pipe_list *list = pipe_list; + struct pipe_list **prev = &pipe_list; struct pipe_list *tmp; - if (list->fptr == fptr) { - pipe_list = list->next; - free(list); - return; - } - - while (list->next) { - if (list->next->fptr == fptr) { - tmp = list->next; - list->next = list->next->next; + while ((tmp = *prev) != 0) { + if (tmp->fptr == fptr) { + *prev = tmp->next; free(tmp); return; } - list = list->next; + prev = &tmp->next; } } -- cgit v1.2.3