Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prefer send_msg_int() over send_msg() for better debug output.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
7cc4d62
..
b717b43
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-541,8
+541,8
@@
static char *perform_io(size_t needed, int flags)
if (DEBUG_GTE(IO, 3)) {
rprintf(FINFO, "[%s] perform_io(%ld, outroom) needs to flush %ld\n",
who_am_i(), (long)needed,
if (DEBUG_GTE(IO, 3)) {
rprintf(FINFO, "[%s] perform_io(%ld, outroom) needs to flush %ld\n",
who_am_i(), (long)needed,
- iobuf.out.len
> iobuf.out.size - needed
- ? (long)
iobuf.out.len - (iobuf.out.size - needed
) : 0L);
+ iobuf.out.len
+ needed > iobuf.out.size
+ ? (long)
(iobuf.out.len + needed - iobuf.out.size
) : 0L);
}
break;
}
break;
@@
-557,8
+557,8
@@
static char *perform_io(size_t needed, int flags)
if (DEBUG_GTE(IO, 3)) {
rprintf(FINFO, "[%s] perform_io(%ld, msgroom) needs to flush %ld\n",
who_am_i(), (long)needed,
if (DEBUG_GTE(IO, 3)) {
rprintf(FINFO, "[%s] perform_io(%ld, msgroom) needs to flush %ld\n",
who_am_i(), (long)needed,
- iobuf.
out.len > iobuf.msg.size - needed
- ? (long)
iobuf.out.len - (iobuf.msg.size - needed
) : 0L);
+ iobuf.
msg.len + needed > iobuf.msg.size
+ ? (long)
(iobuf.msg.len + needed - iobuf.msg.size
) : 0L);
}
break;
}
break;
@@
-578,11
+578,13
@@
static char *perform_io(size_t needed, int flags)
goto double_break;
break;
case PIO_NEED_OUTROOM:
goto double_break;
break;
case PIO_NEED_OUTROOM:
- if (iobuf.out.len <= iobuf.out.size - needed)
+ /* Note that iobuf.out_empty_len doesn't factor into this check
+ * because iobuf.out.len already holds any needed header len. */
+ if (iobuf.out.len + needed <= iobuf.out.size)
goto double_break;
break;
case PIO_NEED_MSGROOM:
goto double_break;
break;
case PIO_NEED_MSGROOM:
- if (iobuf.msg.len
<= iobuf.msg.size - needed
)
+ if (iobuf.msg.len
+ needed <= iobuf.msg.size
)
goto double_break;
break;
}
goto double_break;
break;
}
@@
-1314,9
+1316,10
@@
static void read_a_msg(void)
if (msg_bytes != 4 || am_sender)
goto invalid_msg;
data = perform_io(4, PIO_INPUT_AND_CONSUME);
if (msg_bytes != 4 || am_sender)
goto invalid_msg;
data = perform_io(4, PIO_INPUT_AND_CONSUME);
- io_error |= IVAL(data, 0);
+ val = IVAL(data, 0);
+ io_error |= val;
if (!am_generator)
if (!am_generator)
- send_msg
(MSG_IO_ERROR, data, 4, 0
);
+ send_msg
_int(MSG_IO_ERROR, val
);
break;
case MSG_IO_TIMEOUT:
if (msg_bytes != 4 || am_server || am_generator)
break;
case MSG_IO_TIMEOUT:
if (msg_bytes != 4 || am_server || am_generator)
@@
-1393,19
+1396,21
@@
static void read_a_msg(void)
exit_cleanup(RERR_STREAMIO);
}
data = perform_io(4, PIO_INPUT_AND_CONSUME);
exit_cleanup(RERR_STREAMIO);
}
data = perform_io(4, PIO_INPUT_AND_CONSUME);
+ val = IVAL(data, 0);
if (am_generator)
if (am_generator)
- got_flist_entry_status(FES_SUCCESS,
IVAL(data, 0)
);
+ got_flist_entry_status(FES_SUCCESS,
val
);
else
else
- successful_send(
IVAL(data, 0)
);
+ successful_send(
val
);
break;
case MSG_NO_SEND:
if (msg_bytes != 4)
goto invalid_msg;
data = perform_io(4, PIO_INPUT_AND_CONSUME);
break;
case MSG_NO_SEND:
if (msg_bytes != 4)
goto invalid_msg;
data = perform_io(4, PIO_INPUT_AND_CONSUME);
+ val = IVAL(data, 0);
if (am_generator)
if (am_generator)
- got_flist_entry_status(FES_NO_SEND,
IVAL(data, 0)
);
+ got_flist_entry_status(FES_NO_SEND,
val
);
else
else
- send_msg
(MSG_NO_SEND, data, 4, 0
);
+ send_msg
_int(MSG_NO_SEND, val
);
break;
case MSG_ERROR_SOCKET:
case MSG_ERROR_UTF8:
break;
case MSG_ERROR_SOCKET:
case MSG_ERROR_UTF8: