[EGIT] [core/efl] master 02/05: ecore - efl thread - remove more copy & paste in fd in clearing handling

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=40800366b25a0a8ede2e4d329a744606d56b4714

commit 40800366b25a0a8ede2e4d329a744606d56b4714
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sat Jul 20 11:46:07 2019 +0100

    ecore - efl thread - remove more copy & paste in fd in clearing handling
    
    move to common shared function to reduce c&p
---
 src/lib/ecore/efl_thread.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/lib/ecore/efl_thread.c b/src/lib/ecore/efl_thread.c
index f08be0e119..39329284ca 100644
--- a/src/lib/ecore/efl_thread.c
+++ b/src/lib/ecore/efl_thread.c
@@ -960,6 +960,15 @@ _efl_thread_efl_io_reader_eos_get(const Eo *obj 
EINA_UNUSED, Efl_Thread_Data *pd
    return pd->fd.eos_read;
 }
 
+static void
+_io_writer_write_fd_in_clear(Efl_Thread_Data *pd)
+{
+   close(pd->fd.in);
+   pd->fd.in = -1;
+   efl_del(pd->fd.in_handler);
+   pd->fd.in_handler = NULL;
+}
+
 EOLIAN static Eina_Error
 _efl_thread_efl_io_writer_write(Eo *obj, Efl_Thread_Data *pd, Eina_Slice 
*slice, Eina_Slice *remaining)
 {
@@ -991,22 +1000,14 @@ _efl_thread_efl_io_writer_write(Eo *obj, Efl_Thread_Data 
*pd, Eina_Slice *slice,
      efl_io_writer_can_write_set(obj, EINA_FALSE);
    if (r == 0)
      {
-        close(pd->fd.in);
-        pd->fd.in = -1;
-        efl_del(pd->fd.in_handler);
-        pd->fd.in_handler = NULL;
+        _io_writer_write_fd_in_clear(pd);
         _thread_exit_eval(obj, pd);
         return EPIPE;
      }
    return 0;
 err:
    if ((pd->fd.in != -1) && (errno != EAGAIN))
-     {
-        close(pd->fd.in);
-        pd->fd.in = -1;
-        efl_del(pd->fd.in_handler);
-        pd->fd.in_handler = NULL;
-     }
+     _io_writer_write_fd_in_clear(pd);
    if (remaining) *remaining = *slice;
    slice->len = 0;
    slice->mem = NULL;

--