Page MenuHomeFreeBSD
Files F153408267

D21388.id61324.diff
No OneTemporary
Actions

D21388.id61324.diff
View Options

Index: sbin/ggate/ggatec/ggatec.c
===================================================================
--- sbin/ggate/ggatec/ggatec.c
+++ sbin/ggate/ggatec/ggatec.c
@@ -35,6 +35,7 @@
#include <unistd.h>
#include <string.h>
#include <ctype.h>
+#include <inttypes.h>
#include <libgen.h>
#include <pthread.h>
#include <signal.h>
@@ -174,8 +175,9 @@
pthread_kill(recvtd, SIGUSR1);
break;
}
- g_gate_log(LOG_DEBUG, "Sent %zd bytes (offset=%llu, "
- "size=%u).", data, hdr.gh_offset, hdr.gh_length);
+ g_gate_log(LOG_DEBUG, "Sent %zd bytes (offset=%"
+ PRIu64 ", size=%" PRIu32 ").", data, hdr.gh_offset,
+ hdr.gh_length);
}
}
g_gate_log(LOG_DEBUG, "%s: Died.", __func__);
@@ -229,9 +231,9 @@
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=%"
+ PRIu64 ", size=%" PRIu32 ").", 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
@@ -43,6 +43,7 @@
#include <assert.h>
#include <err.h>
#include <errno.h>
+#include <inttypes.h>
#include <fcntl.h>
#include <libgen.h>
#include <libutil.h>
@@ -650,8 +651,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=%" PRIu64 " length=%" PRIu32,
+ __func__, req->r_offset, req->r_length);
/*
* Allocate memory for data.
@@ -713,13 +714,16 @@
/*
* Check the request.
*/
+ if( req->r_cmd != 0 && req->r_cmd != 1 )
+ g_gate_log(LOG_DEBUG, "%s: r_cmd=%hu",
+ __func__, req->r_cmd );
assert(req->r_cmd == GGATE_CMD_READ || req->r_cmd == GGATE_CMD_WRITE);
assert(req->r_offset + req->r_length <= (uintmax_t)conn->c_mediasize);
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=%" PRIu64 " length=%" PRIu32,
+ __func__, req->r_offset, req->r_length);
/*
* Do the request.
@@ -792,8 +796,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=%" PRIu64 " length=%" PRIu32,
+ __func__, req->r_offset, req->r_length);
/*
* Send the request.
@@ -812,8 +816,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=%" PRIu64 ", size=%" PRIu32
+ ").", data, req->r_offset, req->r_length);
free(req->r_data);
}
free(req);

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 12:16 AM (11 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31940788
Default Alt Text
D21388.id61324.diff (3 KB)

Event Timeline