commit 9526b5db6ed5281dade13e4914087f49d7d16d2a Author: Zack Weinberg zackw@cmu.edu Date: Wed Jun 13 11:24:12 2012 -0400

Minor code-formatting fixes. --- src/protocol/null.cc | 3 ++- src/steg/embed.cc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/protocol/null.cc b/src/protocol/null.cc index c5ec831..ca6cc74 100644 --- a/src/protocol/null.cc +++ b/src/protocol/null.cc @@ -268,7 +268,8 @@ int null_conn_t::recv() { log_assert(this->upstream); - log_debug(this, "receiving %lu bytes", (unsigned long)evbuffer_get_length(this->inbound())); + log_debug(this, "receiving %lu bytes", + (unsigned long)evbuffer_get_length(this->inbound())); return evbuffer_add_buffer(bufferevent_get_output(this->upstream->up_buffer), this->inbound()); } diff --git a/src/steg/embed.cc b/src/steg/embed.cc index 463148d..4734edb 100644 --- a/src/steg/embed.cc +++ b/src/steg/embed.cc @@ -82,14 +82,14 @@ embed_steg_config_t::embed_steg_config_t(config_t *cfg) for (vector<trace_t>::iterator p = traces.begin(); p != traces.end(); ++p) { int num_pkt; if (fscanf(trace_file, "%d", &num_pkt) < 1) - log_abort("couldn't read number of packets in trace %li", + log_abort("couldn't read number of packets in trace %ld", (long)(p - traces.begin()));

p->pkt_sizes.resize(num_pkt); p->pkt_times.resize(num_pkt); for (int i = 0; i < num_pkt; i++) if (fscanf(trace_file, "%hd %d", &p->pkt_sizes[i], &p->pkt_times[i]) < 1) - log_abort("couldn't read trace entry %li/%d", + log_abort("couldn't read trace entry %ld/%d", (long)(p - traces.begin()), i); }