From b13e8a84f63b6b2cab90d3d06da618c16ba9e7f0 Mon Sep 17 00:00:00 2001 From: raster Date: Thu, 23 Apr 2009 07:08:50 +0000 Subject: [PATCH] From: Lars Munch thx, but you committed rev 1 of the patch. I send out an updated patch since the function naming did not follow "e" style. Attached patch renames the functions accordingly. Please apply. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@40322 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore/Ecore.h | 4 ++-- src/lib/ecore/ecore_pipe.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/ecore/Ecore.h b/src/lib/ecore/Ecore.h index 7d49239..f498442 100644 --- a/src/lib/ecore/Ecore.h +++ b/src/lib/ecore/Ecore.h @@ -294,8 +294,8 @@ extern "C" { EAPI Ecore_Pipe *ecore_pipe_add(void (*handler) (void *data, void *buffer, unsigned int nbyte), const void *data); EAPI void *ecore_pipe_del(Ecore_Pipe *p); EAPI int ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes); - EAPI void ecore_pipe_close_write(Ecore_Pipe *p); - EAPI void ecore_pipe_close_read(Ecore_Pipe *p); + EAPI void ecore_pipe_write_close(Ecore_Pipe *p); + EAPI void ecore_pipe_read_close(Ecore_Pipe *p); EAPI double ecore_time_get(void); EAPI double ecore_loop_time_get(void); diff --git a/src/lib/ecore/ecore_pipe.c b/src/lib/ecore/ecore_pipe.c index 5608eda..28928bf 100644 --- a/src/lib/ecore/ecore_pipe.c +++ b/src/lib/ecore/ecore_pipe.c @@ -350,14 +350,14 @@ ecore_pipe_del(Ecore_Pipe *p) * @ingroup Ecore_Pipe_Group */ EAPI void -ecore_pipe_close_read(Ecore_Pipe *p) +ecore_pipe_read_close(Ecore_Pipe *p) { void *data; if (!ECORE_MAGIC_CHECK(p, ECORE_MAGIC_PIPE)) { ECORE_MAGIC_FAIL(p, ECORE_MAGIC_PIPE, - "ecore_pipe_close_read"); + "ecore_pipe_read_close"); return; } ecore_main_fd_handler_del(p->fd_handler); @@ -373,14 +373,14 @@ ecore_pipe_close_read(Ecore_Pipe *p) * @ingroup Ecore_Pipe_Group */ EAPI void -ecore_pipe_close_write(Ecore_Pipe *p) +ecore_pipe_write_close(Ecore_Pipe *p) { void *data; if (!ECORE_MAGIC_CHECK(p, ECORE_MAGIC_PIPE)) { ECORE_MAGIC_FAIL(p, ECORE_MAGIC_PIPE, - "ecore_pipe_close_write"); + "ecore_pipe_write_close"); return; } close(p->fd_write); -- 2.7.4