Page MenuHomeFreeBSD
Files F153324446

D21388.id76723.diff
No OneTemporary
Actions

D21388.id76723.diff
View Options

Index: sbin/ggate/ggatec/ggatec.c
===================================================================
--- sbin/ggate/ggatec/ggatec.c
+++ sbin/ggate/ggatec/ggatec.c
@@ -229,9 +229,8 @@
pthread_kill(sendtd, SIGUSR1);
break;
}
- g_gate_log(LOG_DEBUG, "Received %d bytes (offset=%ju, "
- "size=%zu).", data, (uintmax_t)hdr.gh_offset,
- (size_t)hdr.gh_length);
+ g_gate_log(LOG_DEBUG, "Received %d bytes (offset=%llu, "
+ "size=%u).", data, hdr.gh_offset, hdr.gh_length);
}
g_gate_ioctl(G_GATE_CMD_DONE, &ggio);
Index: sbin/ggate/ggated/ggated.c
===================================================================
--- sbin/ggate/ggated/ggated.c
+++ sbin/ggate/ggated/ggated.c
@@ -649,8 +649,8 @@
g_gate_log(LOG_DEBUG, "Received hdr packet.");
g_gate_swap2h_hdr(&req->r_hdr);
- g_gate_log(LOG_DEBUG, "%s: offset=%jd length=%u", __func__,
- (intmax_t)req->r_offset, (unsigned)req->r_length);
+ g_gate_log(LOG_DEBUG, "%s: offset=%llu length=%u", __func__,
+ req->r_offset, req->r_length);
/*
* Allocate memory for data.
@@ -717,8 +717,8 @@
assert((req->r_offset % conn->c_sectorsize) == 0);
assert((req->r_length % conn->c_sectorsize) == 0);
- g_gate_log(LOG_DEBUG, "%s: offset=%jd length=%u", __func__,
- (intmax_t)req->r_offset, (unsigned)req->r_length);
+ g_gate_log(LOG_DEBUG, "%s: offset=%llu length=%u", __func__,
+ req->r_offset, req->r_length);
/*
* Do the request.
@@ -791,8 +791,8 @@
error = pthread_mutex_unlock(&outqueue_mtx);
assert(error == 0);
- g_gate_log(LOG_DEBUG, "%s: offset=%jd length=%u", __func__,
- (intmax_t)req->r_offset, (unsigned)req->r_length);
+ g_gate_log(LOG_DEBUG, "%s: offset=%llu length=%u", __func__,
+ req->r_offset, req->r_length);
/*
* Send the request.
@@ -811,8 +811,8 @@
strerror(errno));
}
g_gate_log(LOG_DEBUG,
- "Sent %zd bytes (offset=%ju, size=%zu).", data,
- (uintmax_t)req->r_offset, (size_t)req->r_length);
+ "Sent %zd bytes (offset=%llu, size=%u).", data,
+ req->r_offset, req->r_length);
free(req->r_data);
}
free(req);

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 21, 11:53 AM (18 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31908641
Default Alt Text
D21388.id76723.diff (2 KB)

Event Timeline