[PATCH 1/2] size_t is 64 bit on some architectures.
Ronnie Sahlberg
ronniesahlberg
Tue Jun 24 05:11:50 CEST 2008
fix debug print statements to use correct printf types for the FCOE
target
Signed-off-by: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Signed-off-by: root <root at ubuntu-server-1.sahlberg.net>
---
usr/fcoe/fcs_state.c | 4 ++--
usr/fcoe/openfc_scst.c | 6 +++---
usr/fcoe/sa_state.c | 14 +++++++-------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/usr/fcoe/fcs_state.c b/usr/fcoe/fcs_state.c
index a4a065a..288280e 100644
--- a/usr/fcoe/fcs_state.c
+++ b/usr/fcoe/fcs_state.c
@@ -107,11 +107,11 @@ struct fcs_state *fcs_create(struct fcs_create_args *ap)
outer_port = ap->fca_port;
mfs = fc_port_get_max_frame_size(outer_port);
if (mfs < FC_MIN_MAX_PAYLOAD) {
- eprintf("port max frame size only %d (0x%x) bytes - "
+ eprintf("port max frame size only %zu (0x%zx) bytes - "
"setting to %d", mfs, mfs, FC_MIN_MAX_PAYLOAD);
mfs = 1024;
} else if (mfs > FC_MAX_PAYLOAD + sizeof(struct fc_frame_header)) {
- eprintf("port max frame size too large: %d (0x%x) bytes\n",
+ eprintf("port max frame size too large: %zu (0x%zx) bytes\n",
mfs, mfs);
mfs = FC_MAX_PAYLOAD + sizeof(struct fc_frame_header);
}
diff --git a/usr/fcoe/openfc_scst.c b/usr/fcoe/openfc_scst.c
index 2cf0cdd..f24fc28 100644
--- a/usr/fcoe/openfc_scst.c
+++ b/usr/fcoe/openfc_scst.c
@@ -214,7 +214,7 @@ openfc_scsi_send_data(struct fc_scsi_pkt *fsp,
struct fc_seq *sp)
len = scsi_get_in_length(&fsp->scmd) - scsi_get_in_resid(&fsp->scmd);
- dprintf("%p %d %d\n", fsp, data_len, scsi_get_in_resid(&fsp->scmd));
+ dprintf("%p %zu %d\n", fsp, data_len, scsi_get_in_resid(&fsp->scmd));
len = min(data_len, len);
if (offset != fsp->xfer_len) {
@@ -242,7 +242,7 @@ openfc_scsi_send_data(struct fc_scsi_pkt *fsp,
struct fc_seq *sp)
fc_frame_set_offset(fp, buf_offset);
}
- dprintf("%d %d %d\n", tlen, remaining, buf_offset);
+ dprintf("%zu %zu %zu\n", tlen, remaining, buf_offset);
page_addr = (char *)scsi_get_in_buffer(&fsp->scmd) + buf_offset;
memcpy(data, (char *) page_addr, tlen);
@@ -260,7 +260,7 @@ openfc_scsi_send_data(struct fc_scsi_pkt *fsp,
struct fc_seq *sp)
continue;
}
- dprintf("%d %d %d\n", tlen, remaining, error);
+ dprintf("%zu %zu %d\n", tlen, remaining, error);
fp = NULL;
if (error) {
/*
diff --git a/usr/fcoe/sa_state.c b/usr/fcoe/sa_state.c
index 95dbe03..ad7ef98 100644
--- a/usr/fcoe/sa_state.c
+++ b/usr/fcoe/sa_state.c
@@ -116,7 +116,7 @@ struct sa_state_table *sa_state_table_alloc(const
char *name,
case SST_STATE:
if (dp->sd_in == 0) {
eprintf("state table %s has invalid state %d "
- "at STATE entry %d",
+ "at STATE entry %ld",
name, dp->sd_in, dp - state_desc);
error++;
}
@@ -127,7 +127,7 @@ struct sa_state_table *sa_state_table_alloc(const
char *name,
case SST_FROM:
if (dp->sd_in == 0) {
eprintf("state table %s has invalid state %d "
- "at FROM entry %d",
+ "at FROM entry %ld",
name, dp->sd_in, dp - state_desc);
error++;
}
@@ -136,7 +136,7 @@ struct sa_state_table *sa_state_table_alloc(const
char *name,
case SST_EVENT:
if (dp->sd_in == 0) {
eprintf("state table %s has invalid event %d "
- "at EVENT entry %d",
+ "at EVENT entry %ld",
name, dp->sd_in, dp - state_desc);
error++;
}
@@ -146,7 +146,7 @@ struct sa_state_table *sa_state_table_alloc(const
char *name,
case SST_HANDLER:
if (dp->sd_ptr == NULL) {
eprintf("state table %s has invalid hander %d "
- "at HANDLER entry %d",
+ "at HANDLER entry %ld",
name, dp->sd_in, dp - state_desc);
error++;
}
@@ -156,19 +156,19 @@ struct sa_state_table
*sa_state_table_alloc(const char *name,
case SST_NEXT:
if (cur_state == 0) {
eprintf("state table %s has no current state "
- "for NEXT entry %d",
+ "for NEXT entry %ld",
name, dp - state_desc);
error++;
}
if (dp->sd_in >= event_limit) {
eprintf("state table %s has event %d "
- "out of range at NEXT entry %d",
+ "out of range at NEXT entry %ld",
name, dp->sd_in, dp - state_desc);
error++;
}
if (dp->sd_next == 0 || dp->sd_next >= state_limit) {
eprintf("state table %s has state %d "
- "out of range at NEXT entry %d",
+ "out of range at NEXT entry %ld",
name, dp->sd_next, dp - state_desc);
error++;
}
--
1.5.4.3
------=_Part_14794_16303730.1214781861281
Content-Type: application/x-gzip;
name=0001-size_t-is-64-bit-on-some-architectures.patch.gz
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fi29k51y0
Content-Disposition: attachment;
filename=0001-size_t-is-64-bit-on-some-architectures.patch.gz
RnJvbSBhMGQ5M2U3MWVjZTIxYjQ0Y2IwYzJlZmNmYjFmOTQyMjUyOTliZmJjIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBSb25uaWUgU2FobGJlcmcgPHJvbm5pZXNhaGxiZXJnQGdtYWls
LmNvbT4KRGF0ZTogVHVlLCAyNCBKdW4gMjAwOCAxMzoxMTo1MCArMTAwMApTdWJqZWN0OiBbUEFU
Q0ggMS8yXSBzaXplX3QgaXMgNjQgYml0IG9uIHNvbWUgYXJjaGl0ZWN0dXJlcy4KCmZpeCBkZWJ1
ZyBwcmludCBzdGF0ZW1lbnRzIHRvIHVzZSBjb3JyZWN0IHByaW50ZiB0eXBlcyBmb3IgdGhlIEZD
T0UKdGFyZ2V0CgpTaWduZWQtb2ZmLWJ5OiBSb25uaWUgU2FobGJlcmcgPHJvbm5pZXNhaGxiZXJn
QGdtYWlsLmNvbT4KU2lnbmVkLW9mZi1ieTogcm9vdCA8cm9vdEB1YnVudHUtc2VydmVyLTEuc2Fo
bGJlcmcubmV0PgotLS0KIHVzci9mY29lL2Zjc19zdGF0ZS5jICAgfCAgICA0ICsrLS0KIHVzci9m
Y29lL29wZW5mY19zY3N0LmMgfCAgICA2ICsrKy0tLQogdXNyL2Zjb2Uvc2Ffc3RhdGUuYyAgICB8
ICAgMTQgKysrKysrKy0tLS0tLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwg
MTIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvdXNyL2Zjb2UvZmNzX3N0YXRlLmMgYi91c3Iv
ZmNvZS9mY3Nfc3RhdGUuYwppbmRleCBhNGEwNjVhLi4yODgyODBlIDEwMDY0NAotLS0gYS91c3Iv
ZmNvZS9mY3Nfc3RhdGUuYworKysgYi91c3IvZmNvZS9mY3Nfc3RhdGUuYwpAQCAtMTA3LDExICsx
MDcsMTEgQEAgc3RydWN0IGZjc19zdGF0ZSAqZmNzX2NyZWF0ZShzdHJ1Y3QgZmNzX2NyZWF0ZV9h
cmdzICphcCkKIAlvdXRlcl9wb3J0ID0gYXAtPmZjYV9wb3J0OwogCW1mcyA9IGZjX3BvcnRfZ2V0
X21heF9mcmFtZV9zaXplKG91dGVyX3BvcnQpOwogCWlmIChtZnMgPCBGQ19NSU5fTUFYX1BBWUxP
QUQpIHsKLQkJZXByaW50ZigicG9ydCBtYXggZnJhbWUgc2l6ZSBvbmx5ICVkICgweCV4KSBieXRl
cyAtICIKKwkJZXByaW50ZigicG9ydCBtYXggZnJhbWUgc2l6ZSBvbmx5ICV6dSAoMHglengpIGJ5
dGVzIC0gIgogCQkgICAgICAgInNldHRpbmcgdG8gJWQiLCBtZnMsIG1mcywgRkNfTUlOX01BWF9Q
QVlMT0FEKTsKIAkJbWZzID0gMTAyNDsKIAl9IGVsc2UgaWYgKG1mcyA+IEZDX01BWF9QQVlMT0FE
ICsgc2l6ZW9mKHN0cnVjdCBmY19mcmFtZV9oZWFkZXIpKSB7Ci0JCWVwcmludGYoInBvcnQgbWF4
IGZyYW1lIHNpemUgdG9vIGxhcmdlOiAlZCAoMHgleCkgYnl0ZXNcbiIsCisJCWVwcmludGYoInBv
cnQgbWF4IGZyYW1lIHNpemUgdG9vIGxhcmdlOiAlenUgKDB4JXp4KSBieXRlc1xuIiwKIAkJICAg
ICAgIG1mcywgbWZzKTsKIAkJbWZzID0gRkNfTUFYX1BBWUxPQUQgKyBzaXplb2Yoc3RydWN0IGZj
X2ZyYW1lX2hlYWRlcik7CiAJfQpkaWZmIC0tZ2l0IGEvdXNyL2Zjb2Uvb3BlbmZjX3Njc3QuYyBi
L3Vzci9mY29lL29wZW5mY19zY3N0LmMKaW5kZXggMmNmMGNkZC4uZjI0ZmMyOCAxMDA2NDQKLS0t
IGEvdXNyL2Zjb2Uvb3BlbmZjX3Njc3QuYworKysgYi91c3IvZmNvZS9vcGVuZmNfc2NzdC5jCkBA
IC0yMTQsNyArMjE0LDcgQEAgb3BlbmZjX3Njc2lfc2VuZF9kYXRhKHN0cnVjdCBmY19zY3NpX3Br
dCAqZnNwLCBzdHJ1Y3QgZmNfc2VxICpzcCkKIAogCWxlbiA9IHNjc2lfZ2V0X2luX2xlbmd0aCgm
ZnNwLT5zY21kKSAtIHNjc2lfZ2V0X2luX3Jlc2lkKCZmc3AtPnNjbWQpOwogCi0JZHByaW50Zigi
JXAgJWQgJWRcbiIsIGZzcCwgZGF0YV9sZW4sIHNjc2lfZ2V0X2luX3Jlc2lkKCZmc3AtPnNjbWQp
KTsKKwlkcHJpbnRmKCIlcCAlenUgJWRcbiIsIGZzcCwgZGF0YV9sZW4sIHNjc2lfZ2V0X2luX3Jl
c2lkKCZmc3AtPnNjbWQpKTsKIAlsZW4gPSBtaW4oZGF0YV9sZW4sIGxlbik7CiAKIAlpZiAob2Zm
c2V0ICE9IGZzcC0+eGZlcl9sZW4pIHsKQEAgLTI0Miw3ICsyNDIsNyBAQCBvcGVuZmNfc2NzaV9z
ZW5kX2RhdGEoc3RydWN0IGZjX3Njc2lfcGt0ICpmc3AsIHN0cnVjdCBmY19zZXEgKnNwKQogCQkJ
CWZjX2ZyYW1lX3NldF9vZmZzZXQoZnAsIGJ1Zl9vZmZzZXQpOwogCQkJfQogCi0JCQlkcHJpbnRm
KCIlZCAlZCAlZFxuIiwgdGxlbiwgcmVtYWluaW5nLCBidWZfb2Zmc2V0KTsKKwkJCWRwcmludGYo
IiV6dSAlenUgJXp1XG4iLCB0bGVuLCByZW1haW5pbmcsIGJ1Zl9vZmZzZXQpOwogCQkJcGFnZV9h
ZGRyID0gKGNoYXIgKilzY3NpX2dldF9pbl9idWZmZXIoJmZzcC0+c2NtZCkgKyBidWZfb2Zmc2V0
OwogCiAJCQltZW1jcHkoZGF0YSwgKGNoYXIgKikgcGFnZV9hZGRyLCB0bGVuKTsKQEAgLTI2MCw3
ICsyNjAsNyBAQCBvcGVuZmNfc2NzaV9zZW5kX2RhdGEoc3RydWN0IGZjX3Njc2lfcGt0ICpmc3As
IHN0cnVjdCBmY19zZXEgKnNwKQogCQkJCWNvbnRpbnVlOwogCQkJfQogCi0JCQlkcHJpbnRmKCIl
ZCAlZCAlZFxuIiwgdGxlbiwgcmVtYWluaW5nLCBlcnJvcik7CisJCQlkcHJpbnRmKCIlenUgJXp1
ICVkXG4iLCB0bGVuLCByZW1haW5pbmcsIGVycm9yKTsKIAkJCWZwID0gTlVMTDsKIAkJCWlmIChl
cnJvcikgewogCQkJCS8qCmRpZmYgLS1naXQgYS91c3IvZmNvZS9zYV9zdGF0ZS5jIGIvdXNyL2Zj
b2Uvc2Ffc3RhdGUuYwppbmRleCA5NWRiZTAzLi5hZDdlZjk4IDEwMDY0NAotLS0gYS91c3IvZmNv
ZS9zYV9zdGF0ZS5jCisrKyBiL3Vzci9mY29lL3NhX3N0YXRlLmMKQEAgLTExNiw3ICsxMTYsNyBA
QCBzdHJ1Y3Qgc2Ffc3RhdGVfdGFibGUgKnNhX3N0YXRlX3RhYmxlX2FsbG9jKGNvbnN0IGNoYXIg
Km5hbWUsCiAJCWNhc2UgU1NUX1NUQVRFOgogCQkJaWYgKGRwLT5zZF9pbiA9PSAwKSB7CiAJCQkJ
ZXByaW50Zigic3RhdGUgdGFibGUgJXMgaGFzIGludmFsaWQgc3RhdGUgJWQgIgotCQkJCSAgICAg
ICAiYXQgU1RBVEUgZW50cnkgJWQiLAorCQkJCSAgICAgICAiYXQgU1RBVEUgZW50cnkgJWxkIiwK
IAkJCQkgICAgICAgbmFtZSwgZHAtPnNkX2luLCBkcCAtIHN0YXRlX2Rlc2MpOwogCQkJCWVycm9y
Kys7CiAJCQl9CkBAIC0xMjcsNyArMTI3LDcgQEAgc3RydWN0IHNhX3N0YXRlX3RhYmxlICpzYV9z
dGF0ZV90YWJsZV9hbGxvYyhjb25zdCBjaGFyICpuYW1lLAogCQljYXNlIFNTVF9GUk9NOgogCQkJ
aWYgKGRwLT5zZF9pbiA9PSAwKSB7CiAJCQkJZXByaW50Zigic3RhdGUgdGFibGUgJXMgaGFzIGlu
dmFsaWQgc3RhdGUgJWQgIgotCQkJCSAgICAgICAiYXQgRlJPTSBlbnRyeSAlZCIsCisJCQkJICAg
ICAgICJhdCBGUk9NIGVudHJ5ICVsZCIsCiAJCQkJICAgICAgIG5hbWUsIGRwLT5zZF9pbiwgZHAg
LSBzdGF0ZV9kZXNjKTsKIAkJCQllcnJvcisrOwogCQkJfQpAQCAtMTM2LDcgKzEzNiw3IEBAIHN0
cnVjdCBzYV9zdGF0ZV90YWJsZSAqc2Ffc3RhdGVfdGFibGVfYWxsb2MoY29uc3QgY2hhciAqbmFt
ZSwKIAkJY2FzZSBTU1RfRVZFTlQ6CiAJCQlpZiAoZHAtPnNkX2luID09IDApIHsKIAkJCQllcHJp
bnRmKCJzdGF0ZSB0YWJsZSAlcyBoYXMgaW52YWxpZCBldmVudCAlZCAiCi0JCQkJICAgICAgICJh
dCBFVkVOVCBlbnRyeSAlZCIsCisJCQkJICAgICAgICJhdCBFVkVOVCBlbnRyeSAlbGQiLAogCQkJ
CSAgICAgICBuYW1lLCBkcC0+c2RfaW4sIGRwIC0gc3RhdGVfZGVzYyk7CiAJCQkJZXJyb3IrKzsK
IAkJCX0KQEAgLTE0Niw3ICsxNDYsNyBAQCBzdHJ1Y3Qgc2Ffc3RhdGVfdGFibGUgKnNhX3N0YXRl
X3RhYmxlX2FsbG9jKGNvbnN0IGNoYXIgKm5hbWUsCiAJCWNhc2UgU1NUX0hBTkRMRVI6CiAJCQlp
ZiAoZHAtPnNkX3B0ciA9PSBOVUxMKSB7CiAJCQkJZXByaW50Zigic3RhdGUgdGFibGUgJXMgaGFz
IGludmFsaWQgaGFuZGVyICVkICIKLQkJCQkgICAgICAgImF0IEhBTkRMRVIgZW50cnkgJWQiLAor
CQkJCSAgICAgICAiYXQgSEFORExFUiBlbnRyeSAlbGQiLAogCQkJCSAgICAgICBuYW1lLCBkcC0+
c2RfaW4sIGRwIC0gc3RhdGVfZGVzYyk7CiAJCQkJZXJyb3IrKzsKIAkJCX0KQEAgLTE1NiwxOSAr
MTU2LDE5IEBAIHN0cnVjdCBzYV9zdGF0ZV90YWJsZSAqc2Ffc3RhdGVfdGFibGVfYWxsb2MoY29u
c3QgY2hhciAqbmFtZSwKIAkJY2FzZSBTU1RfTkVYVDoKIAkJCWlmIChjdXJfc3RhdGUgPT0gMCkg
ewogCQkJCWVwcmludGYoInN0YXRlIHRhYmxlICVzIGhhcyBubyBjdXJyZW50IHN0YXRlICIKLQkJ
CQkgICAgICAgImZvciBORVhUIGVudHJ5ICVkIiwKKwkJCQkgICAgICAgImZvciBORVhUIGVudHJ5
ICVsZCIsCiAJCQkJICAgICAgIG5hbWUsIGRwIC0gc3RhdGVfZGVzYyk7CiAJCQkJZXJyb3IrKzsK
IAkJCX0KIAkJCWlmIChkcC0+c2RfaW4gPj0gZXZlbnRfbGltaXQpIHsKIAkJCQllcHJpbnRmKCJz
dGF0ZSB0YWJsZSAlcyBoYXMgZXZlbnQgJWQgIgotCQkJCSAgICAgICAib3V0IG9mIHJhbmdlIGF0
IE5FWFQgZW50cnkgJWQiLAorCQkJCSAgICAgICAib3V0IG9mIHJhbmdlIGF0IE5FWFQgZW50cnkg
JWxkIiwKIAkJCQkgICAgICAgbmFtZSwgZHAtPnNkX2luLCBkcCAtIHN0YXRlX2Rlc2MpOwogCQkJ
CWVycm9yKys7CiAJCQl9CiAJCQlpZiAoZHAtPnNkX25leHQgPT0gMCB8fCBkcC0+c2RfbmV4dCA+
PSBzdGF0ZV9saW1pdCkgewogCQkJCWVwcmludGYoInN0YXRlIHRhYmxlICVzIGhhcyBzdGF0ZSAl
ZCAiCi0JCQkJICAgICAgICJvdXQgb2YgcmFuZ2UgYXQgTkVYVCBlbnRyeSAlZCIsCisJCQkJICAg
ICAgICJvdXQgb2YgcmFuZ2UgYXQgTkVYVCBlbnRyeSAlbGQiLAogCQkJCSAgICAgICBuYW1lLCBk
cC0+c2RfbmV4dCwgZHAgLSBzdGF0ZV9kZXNjKTsKIAkJCQllcnJvcisrOwogCQkJfQotLSAKMS41
LjQuMwoK
------=_Part_14794_16303730.1214781861281--
More information about the stgt
mailing list