chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0885468
)
socket-proxyd: Actually, some of those sizes are unsigned.
author
David Strauss
<david@davidstrauss.net>
Thu, 31 Oct 2013 22:30:49 +0000
(15:30 -0700)
committer
David Strauss
<david@davidstrauss.net>
Thu, 31 Oct 2013 22:30:49 +0000
(15:30 -0700)
src/socket-proxy/socket-proxyd.c
patch
|
blob
|
history
diff --git
a/src/socket-proxy/socket-proxyd.c
b/src/socket-proxy/socket-proxyd.c
index 34b1c15dfedd15efbfe567386c84f9291cfb9772..05ea88ac69c831103dc1ec2962f0544dd87565a6 100644
(file)
--- a/
src/socket-proxy/socket-proxyd.c
+++ b/
src/socket-proxy/socket-proxyd.c
@@
-147,7
+147,7
@@
static int send_buffer(struct connection *sender) {
sender->buffer_sent_len += len;
}
sender->buffer_sent_len += len;
}
- log_debug("send(%d, ...) completed with %z
d
bytes still buffered.", receiver->fd, sender->buffer_filled_len - sender->buffer_sent_len);
+ log_debug("send(%d, ...) completed with %z
u
bytes still buffered.", receiver->fd, sender->buffer_filled_len - sender->buffer_sent_len);
/* Detect a would-block state or partial send. */
if (sender->buffer_filled_len > sender->buffer_sent_len) {
/* Detect a would-block state or partial send. */
if (sender->buffer_filled_len > sender->buffer_sent_len) {
@@
-206,7
+206,7
@@
static int transfer_data_cb(sd_event_source *s, int fd, uint32_t revents, void *
log_debug("Got event revents=%d from fd=%d (conn %p).", revents, fd, c);
if (revents & EPOLLIN) {
log_debug("Got event revents=%d from fd=%d (conn %p).", revents, fd, c);
if (revents & EPOLLIN) {
- log_debug("About to recv up to %z
d bytes from fd=%d (%zd
/BUFFER_SIZE).", BUFFER_SIZE - c->buffer_filled_len, fd, c->buffer_filled_len);
+ log_debug("About to recv up to %z
u bytes from fd=%d (%zu
/BUFFER_SIZE).", BUFFER_SIZE - c->buffer_filled_len, fd, c->buffer_filled_len);
/* Receive until the buffer's full, there's no more data,
* or the client/server disconnects. */
/* Receive until the buffer's full, there's no more data,
* or the client/server disconnects. */
@@
-234,7
+234,7
@@
static int transfer_data_cb(sd_event_source *s, int fd, uint32_t revents, void *
assert(len > 0);
log_debug("Recording that the buffer got %zd more bytes full.", len);
c->buffer_filled_len += len;
assert(len > 0);
log_debug("Recording that the buffer got %zd more bytes full.", len);
c->buffer_filled_len += len;
- log_debug("Buffer now has %z
d
bytes full.", c->buffer_filled_len);
+ log_debug("Buffer now has %z
u
bytes full.", c->buffer_filled_len);
}
/* Try sending the data immediately. */
}
/* Try sending the data immediately. */