rggammon
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ecore ipc - fix send to skip data payload if null/0 

conversion to efl.nmet didnt deal with null/0 zised payloads properly
and tried to send them, resulting in lots of ERR complaints which were
not errors. fix that to not try and send such empty payloads

@fix
This commit is contained in:
Carsten Haitzler 2018-04-11 14:34:40 +09:00
parent 23800a06a0
commit 86c855bdd3
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/lib/ecore_ipc/ecore_ipc.c
View File

@ -969,20 +969,23 @@ ecore_ipc_server_send(Ecore_Ipc_Server *svr, int major, int minor, int ref, int
return 0;
}
slice.mem = data;
slice.len = size;
err = efl_io_writer_write(svr->dialer.input, &slice, NULL);
if (err)
if ((data) && (size > 0))
{
ERR("could not write queue=%p %zd bytes: %s",
svr->dialer.input, slice.len, eina_error_msg_get(err));
return 0;
}
if (slice.len < (size_t)size)
{
ERR("only wrote %zd of %d bytes to queue %p",
slice.len, size, svr->dialer.input);
return 0;
slice.mem = data;
slice.len = size;
err = efl_io_writer_write(svr->dialer.input, &slice, NULL);
if (err)
{
ERR("could not write queue=%p %zd bytes: %s",
svr->dialer.input, slice.len, eina_error_msg_get(err));
return 0;
}
if (slice.len < (size_t)size)
{
ERR("only wrote %zd of %d bytes to queue %p",
slice.len, size, svr->dialer.input);
return 0;
}
}
return s + size;
@ -1188,21 +1191,23 @@ ecore_ipc_client_send(Ecore_Ipc_Client *cl, int major, int minor, int ref, int r
slice.len, s, cl->socket.input);
return 0;
}
slice.mem = data;
slice.len = size;
err = efl_io_writer_write(cl->socket.input, &slice, NULL);
if (err)
if ((data) && (size > 0))
{
ERR("could not write queue=%p %zd bytes: %s",
cl->socket.input, slice.len, eina_error_msg_get(err));
return 0;
}
if (slice.len < (size_t)size)
{
ERR("only wrote %zd of %d bytes to queue %p",
slice.len, size, cl->socket.input);
return 0;
slice.mem = data;
slice.len = size;
err = efl_io_writer_write(cl->socket.input, &slice, NULL);
if (err)
{
ERR("could not write queue=%p %zd bytes: %s",
cl->socket.input, slice.len, eina_error_msg_get(err));
return 0;
}
if (slice.len < (size_t)size)
{
ERR("only wrote %zd of %d bytes to queue %p",
slice.len, size, cl->socket.input);
return 0;
}
}
return s + size;