forked from enlightenment/enlightenment
parent
ecf7f4c4f5
commit
672d1de1e3
|
@ -3082,7 +3082,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
|
||||||
off_t done, total;
|
off_t done, total;
|
||||||
char *src = NULL;
|
char *src = NULL;
|
||||||
char *dst = NULL;
|
char *dst = NULL;
|
||||||
void *p = e->data;
|
char *p = e->data;
|
||||||
|
|
||||||
if (!e->data) return;
|
if (!e->data) return;
|
||||||
|
|
||||||
|
@ -5959,7 +5959,7 @@ static void
|
||||||
_e_fm_file_reorder(const char *file, const char *dst, const char *relative, int after)
|
_e_fm_file_reorder(const char *file, const char *dst, const char *relative, int after)
|
||||||
{
|
{
|
||||||
unsigned int length = strlen(file) + 1 + strlen(dst) + 1 + strlen(relative) + 1 + sizeof(after);
|
unsigned int length = strlen(file) + 1 + strlen(dst) + 1 + strlen(relative) + 1 + sizeof(after);
|
||||||
void *data, *p;
|
char *data, *p;
|
||||||
|
|
||||||
data = alloca(length);
|
data = alloca(length);
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
|
|
|
@ -417,7 +417,7 @@ static int
|
||||||
_e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler)
|
_e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
static void *buf = NULL;
|
static char *buf = NULL;
|
||||||
static int length = 0;
|
static int length = 0;
|
||||||
void *begin = NULL;
|
void *begin = NULL;
|
||||||
ssize_t num = 0;
|
ssize_t num = 0;
|
||||||
|
@ -455,7 +455,7 @@ _e_fm_op_stdin_data(void *data, Ecore_Fd_Handler * fd_handler)
|
||||||
begin = buf;
|
begin = buf;
|
||||||
|
|
||||||
/* Check magic. */
|
/* Check magic. */
|
||||||
if (*(int *)buf != E_FM_OP_MAGIC)
|
if (*((int *)buf) != E_FM_OP_MAGIC)
|
||||||
{
|
{
|
||||||
E_FM_OP_DEBUG("Error while reading from STDIN: magic is not correct!\n");
|
E_FM_OP_DEBUG("Error while reading from STDIN: magic is not correct!\n");
|
||||||
break;
|
break;
|
||||||
|
@ -858,8 +858,8 @@ _e_fm_op_send_error(E_Fm_Op_Task * task, E_Fm_Op_Type type, const char *fmt, ...
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
char buffer[READBUFSIZE];
|
char buffer[READBUFSIZE];
|
||||||
void *buf = &buffer[0];
|
char *buf = &buffer[0];
|
||||||
char *str = buf + 3 * sizeof(int);
|
char *str = buf + (3 * sizeof(int));
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
|
@ -873,11 +873,11 @@ _e_fm_op_send_error(E_Fm_Op_Task * task, E_Fm_Op_Type type, const char *fmt, ...
|
||||||
vsnprintf(str, READBUFSIZE - 3 * sizeof(int), fmt, ap);
|
vsnprintf(str, READBUFSIZE - 3 * sizeof(int), fmt, ap);
|
||||||
len = strlen(str);
|
len = strlen(str);
|
||||||
|
|
||||||
*(int *)buf = E_FM_OP_MAGIC;
|
*((int *)buf) = E_FM_OP_MAGIC;
|
||||||
*(int *)(buf + sizeof(int)) = type;
|
*((int *)(buf + sizeof(int))) = type;
|
||||||
*(int *)(buf + 2 * sizeof(int)) = len + 1;
|
*((int *)(buf + (2 * sizeof(int)))) = len + 1;
|
||||||
|
|
||||||
write(STDOUT_FILENO, buf, 3*sizeof(int) + len + 1);
|
write(STDOUT_FILENO, buf, (3 * sizeof(int)) + len + 1);
|
||||||
|
|
||||||
E_FM_OP_DEBUG("%s", str);
|
E_FM_OP_DEBUG("%s", str);
|
||||||
E_FM_OP_DEBUG(" Error sent.\n");
|
E_FM_OP_DEBUG(" Error sent.\n");
|
||||||
|
@ -925,13 +925,13 @@ _e_fm_op_update_progress_report(int percent, int eta, double elapsed, off_t done
|
||||||
{
|
{
|
||||||
const int magic = E_FM_OP_MAGIC;
|
const int magic = E_FM_OP_MAGIC;
|
||||||
const int id = E_FM_OP_PROGRESS;
|
const int id = E_FM_OP_PROGRESS;
|
||||||
void *p, *data;
|
char *p, *data;
|
||||||
int size, src_len, dst_len;
|
int size, src_len, dst_len;
|
||||||
|
|
||||||
src_len = strlen(src);
|
src_len = strlen(src);
|
||||||
dst_len = strlen(dst);
|
dst_len = strlen(dst);
|
||||||
|
|
||||||
size = 2 * sizeof(int) + 2 * sizeof(off_t) + src_len + 1 + dst_len + 1;
|
size = (2 * sizeof(int)) + (2 * sizeof(off_t)) + src_len + 1 + dst_len + 1;
|
||||||
data = alloca(3 * sizeof(int) + size);
|
data = alloca(3 * sizeof(int) + size);
|
||||||
if (!data) return;
|
if (!data) return;
|
||||||
p = data;
|
p = data;
|
||||||
|
@ -954,7 +954,7 @@ _e_fm_op_update_progress_report(int percent, int eta, double elapsed, off_t done
|
||||||
P(dst);
|
P(dst);
|
||||||
#undef P
|
#undef P
|
||||||
|
|
||||||
write(STDOUT_FILENO, data, 3 * sizeof(int) + size);
|
write(STDOUT_FILENO, data, (3 * sizeof(int)) + size);
|
||||||
|
|
||||||
E_FM_OP_DEBUG("Time left: %d at %e\n", eta, elapsed);
|
E_FM_OP_DEBUG("Time left: %d at %e\n", eta, elapsed);
|
||||||
E_FM_OP_DEBUG("Progress %d. \n", percent);
|
E_FM_OP_DEBUG("Progress %d. \n", percent);
|
||||||
|
|
Loading…
Reference in New Issue