Module Name: src Committed By: bouyer Date: Sat Mar 17 17:48:49 UTC 2012
Modified Files: src/external/bsd/iscsi/dist/include [netbsd-6]: iscsiutil.h src/external/bsd/iscsi/dist/src/lib [netbsd-6]: conffile.c disk.c initiator.c parameters.c protocol.c util.c Log Message: Pull up following revision(s) (requested by joerg in ticket #118): external/bsd/iscsi/dist/src/lib/initiator.c: revision 1.8 external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.3 external/bsd/iscsi/dist/src/lib/disk.c: revision 1.7 external/bsd/iscsi/dist/src/lib/parameters.c: revision 1.3 external/bsd/iscsi/dist/src/lib/util.c: revision 1.3 external/bsd/iscsi/dist/src/lib/conffile.c: revision 1.3 external/bsd/iscsi/dist/include/iscsiutil.h: revision 1.4 Add __printflike where needed. Fix various format string issues. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.8.1 src/external/bsd/iscsi/dist/include/iscsiutil.h cvs rdiff -u -r1.2 -r1.2.8.1 src/external/bsd/iscsi/dist/src/lib/conffile.c \ src/external/bsd/iscsi/dist/src/lib/parameters.c \ src/external/bsd/iscsi/dist/src/lib/util.c cvs rdiff -u -r1.6 -r1.6.8.1 src/external/bsd/iscsi/dist/src/lib/disk.c cvs rdiff -u -r1.6 -r1.6.4.1 src/external/bsd/iscsi/dist/src/lib/initiator.c cvs rdiff -u -r1.2 -r1.2.6.1 src/external/bsd/iscsi/dist/src/lib/protocol.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/bsd/iscsi/dist/include/iscsiutil.h diff -u src/external/bsd/iscsi/dist/include/iscsiutil.h:1.3 src/external/bsd/iscsi/dist/include/iscsiutil.h:1.3.8.1 --- src/external/bsd/iscsi/dist/include/iscsiutil.h:1.3 Tue Jun 30 02:44:52 2009 +++ src/external/bsd/iscsi/dist/include/iscsiutil.h Sat Mar 17 17:48:49 2012 @@ -144,9 +144,12 @@ EXTERN uint32_t iscsi_debug_level; * Debugging Functions */ void set_debug(const char *); -void iscsi_trace(const int, const char *, ...); -void iscsi_warn(const char *, const int, const char *, ...); -void iscsi_err(const char *, const int, const char *, ...); +void iscsi_trace(const int, const char *, ...) + __printflike(2, 3); +void iscsi_warn(const char *, const int, const char *, ...) + __printflike(3, 4); +void iscsi_err(const char *, const int, const char *, ...) + __printflike(3, 4); void iscsi_print_buffer(const char *, const size_t); @@ -417,7 +420,7 @@ typedef struct { } iscsi_worker_t; #define ISCSI_WORKER_EXIT(ME) do { \ - iscsi_trace(TRACE_ISCSI_DEBUG ,__FILE__, __LINE__, "exiting\n");\ + iscsi_trace(TRACE_ISCSI_DEBUG, "%s:%d: %s", __FILE__, __LINE__, "exiting\n");\ (ME)->state |= ISCSI_WORKER_STATE_EXITING; \ return 0; \ /* NOTREACHED */ \ Index: src/external/bsd/iscsi/dist/src/lib/conffile.c diff -u src/external/bsd/iscsi/dist/src/lib/conffile.c:1.2 src/external/bsd/iscsi/dist/src/lib/conffile.c:1.2.8.1 --- src/external/bsd/iscsi/dist/src/lib/conffile.c:1.2 Tue Jun 30 02:44:52 2009 +++ src/external/bsd/iscsi/dist/src/lib/conffile.c Sat Mar 17 17:48:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: conffile.c,v 1.2 2009/06/30 02:44:52 agc Exp $ */ +/* $NetBSD: conffile.c,v 1.2.8.1 2012/03/17 17:48:49 bouyer Exp $ */ /* * Copyright © 2006 Alistair Crooks. All rights reserved. @@ -206,7 +206,7 @@ safe_write_ent(FILE *fp, conffile_t *sp, #endif /* report an error and clear up */ -static int +static __printflike(3, 4) int report_error(FILE *fp, char *name, const char *fmt, ...) { va_list vp; Index: src/external/bsd/iscsi/dist/src/lib/parameters.c diff -u src/external/bsd/iscsi/dist/src/lib/parameters.c:1.2 src/external/bsd/iscsi/dist/src/lib/parameters.c:1.2.8.1 --- src/external/bsd/iscsi/dist/src/lib/parameters.c:1.2 Tue Jun 30 02:44:52 2009 +++ src/external/bsd/iscsi/dist/src/lib/parameters.c Sat Mar 17 17:48:49 2012 @@ -821,7 +821,7 @@ param_text_parse(iscsi_parameter_t * hea } if (strlen(value) > ISCSI_PARAM_MAX_LEN) { iscsi_err(__FILE__, __LINE__, - "strlen(value) %u\n", strlen(value)); + "strlen(value) %zu\n", strlen(value)); PTP_CLEANUP; return -1; } Index: src/external/bsd/iscsi/dist/src/lib/util.c diff -u src/external/bsd/iscsi/dist/src/lib/util.c:1.2 src/external/bsd/iscsi/dist/src/lib/util.c:1.2.8.1 --- src/external/bsd/iscsi/dist/src/lib/util.c:1.2 Tue Jun 30 02:44:52 2009 +++ src/external/bsd/iscsi/dist/src/lib/util.c Sat Mar 17 17:48:49 2012 @@ -467,7 +467,7 @@ modify_iov(struct iovec ** iov_ptr, int } if (i == *iovc) { iscsi_err(__FILE__, __LINE__, - "sum of iov lens (%u) < offset (%u)\n", len, offset); + "sum of iov lens (%zu) < offset (%u)\n", len, offset); return -1; } iov[i].iov_len -= disp; @@ -493,7 +493,7 @@ modify_iov(struct iovec ** iov_ptr, int } if (i == *iovc) { iscsi_err(__FILE__, __LINE__, - "sum of iovec lens (%u) < length (%u)\n", len, length); + "sum of iovec lens (%zu) < length (%u)\n", len, length); for (i = 0; i < *iovc; i++) { iscsi_err(__FILE__, __LINE__, "iov[%d].iov_base = %p (len %u)\n", @@ -512,7 +512,7 @@ modify_iov(struct iovec ** iov_ptr, int i, iov[i].iov_base, (unsigned)iov[i].iov_len); len += iov[i].iov_len; } - iscsi_trace(TRACE_NET_IOV, "new iov length: %u bytes\n", len); + iscsi_trace(TRACE_NET_IOV, "new iov length: %zu bytes\n", len); #endif return 0; @@ -960,7 +960,7 @@ iscsi_sock_msg(int sock, int xmit, unsig } if (total_len != len - n) { iscsi_err(__FILE__, __LINE__, - "iovcs sum to %u != total len of %u\n", + "iovcs sum to %zu != total len of %u\n", total_len, len - n); iscsi_err(__FILE__, __LINE__, "iov = %p\n", iov); for (i = 0; i < iovc; i++) { @@ -995,7 +995,7 @@ iscsi_sock_msg(int sock, int xmit, unsig } iscsi_trace(TRACE_NET_IOV, "before modify_iov: %s %d buffers, " - "total_len = %u, n = %u, rc = %u\n", + "total_len = %zu, n = %u, rc = %u\n", xmit ? "gathering from" : "scattering into", iovc, total_len, n, rc); if (modify_iov(&iov, &iovc, (unsigned) rc, len - n) @@ -1010,7 +1010,7 @@ iscsi_sock_msg(int sock, int xmit, unsig } iscsi_trace(TRACE_NET_IOV, "after modify_iov: %s %d buffers, " - "total_len = %u, n = %u, rc = %u\n\n", + "total_len = %zu, n = %u, rc = %u\n\n", xmit ? "gathering from" : "scattering into", iovc, total_len, n, rc); } Index: src/external/bsd/iscsi/dist/src/lib/disk.c diff -u src/external/bsd/iscsi/dist/src/lib/disk.c:1.6 src/external/bsd/iscsi/dist/src/lib/disk.c:1.6.8.1 --- src/external/bsd/iscsi/dist/src/lib/disk.c:1.6 Wed Mar 3 00:44:51 2010 +++ src/external/bsd/iscsi/dist/src/lib/disk.c Sat Mar 17 17:48:49 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: disk.c,v 1.6 2010/03/03 00:44:51 yamt Exp $ */ +/* $NetBSD: disk.c,v 1.6.8.1 2012/03/17 17:48:49 bouyer Exp $ */ /*- * Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -1397,7 +1397,7 @@ disk_write(target_session_t *sess, iscsi bytec, byte_offset); if ((unsigned) bytec > MB(1)) { - iscsi_err(__FILE__, __LINE__, "bytec > %u\n", bytec); + iscsi_err(__FILE__, __LINE__, "bytec > %" PRIu64 "m\n", bytec); NO_CLEANUP; return -1; } @@ -1480,7 +1480,7 @@ disk_read(target_session_t *sess, iscsi_ return -1; } if ((unsigned) bytec > MB(1)) { - iscsi_err(__FILE__, __LINE__, "bytec > %u\n", bytec); + iscsi_err(__FILE__, __LINE__, "bytec > %" PRIu64 "\n", bytec); NO_CLEANUP; return -1; } Index: src/external/bsd/iscsi/dist/src/lib/initiator.c diff -u src/external/bsd/iscsi/dist/src/lib/initiator.c:1.6 src/external/bsd/iscsi/dist/src/lib/initiator.c:1.6.4.1 --- src/external/bsd/iscsi/dist/src/lib/initiator.c:1.6 Thu Oct 6 13:05:29 2011 +++ src/external/bsd/iscsi/dist/src/lib/initiator.c Sat Mar 17 17:48:48 2012 @@ -201,7 +201,7 @@ session_init_i(initiator_session_t ** se int mutual_auth; int one = 1; - iscsi_trace(TRACE_ISCSI_DEBUG, "initializing session %llu\n", isid); + iscsi_trace(TRACE_ISCSI_DEBUG, "initializing session %" PRIu64 "\n", isid); /* Get free session */ if ((*sess = iscsi_queue_remove(&g_session_q)) == NULL) { @@ -294,7 +294,7 @@ session_init_i(initiator_session_t ** se /* Start Tx worker */ - iscsi_trace(TRACE_ISCSI_DEBUG, "starting Tx worker %llu\n", isid); + iscsi_trace(TRACE_ISCSI_DEBUG, "starting Tx worker %" PRIu64 "\n", isid); if (iscsi_queue_init(&s->tx_queue, CONFIG_INITIATOR_QUEUE_DEPTH) == -1) { iscsi_err(__FILE__, __LINE__, "iscsi_queue_init() failed\n"); return -1; @@ -311,12 +311,12 @@ session_init_i(initiator_session_t ** se ISCSI_UNLOCK(&s->tx_worker.exit_mutex, return -1); if (s->state == INITIATOR_SESSION_STATE_DESTROYING) { iscsi_trace(TRACE_ISCSI_DEBUG, - "session %llu is being destroyed, exiting\n", isid); + "session %" PRIu64 " is being destroyed, exiting\n", isid); return -1; } if (s->tx_worker.state & ISCSI_WORKER_STATE_ERROR) { iscsi_err(__FILE__, __LINE__, - "Tx worker %llu started with an error\n", isid); + "Tx worker %" PRIu64 " started with an error\n", isid); return -1; } iscsi_trace(TRACE_ISCSI_DEBUG, "got signal from Tx worker\n"); @@ -337,7 +337,7 @@ session_destroy_i(initiator_session_t * } if (g_target[(int)sess->isid].has_session == 0) { iscsi_err(__FILE__, __LINE__, - "g_target[%llu].has_session==0??\n", sess->isid); + "g_target[%" PRIu64 "].has_session==0??\n", sess->isid); return -1; } sess->state = INITIATOR_SESSION_STATE_DESTROYING; @@ -354,15 +354,15 @@ session_destroy_i(initiator_session_t * if (sess->tx_worker.state & ISCSI_WORKER_STATE_STARTED) { if (sess->tx_worker.state & ISCSI_WORKER_STATE_EXITING) { iscsi_trace(TRACE_ISCSI_DEBUG, - "Tx worker %llu already signalled for exit\n", + "Tx worker %" PRIu64 " already signalled for exit\n", sess->isid); } else { iscsi_trace(TRACE_ISCSI_DEBUG, - "signaling Tx worker %llu into exiting state\n", + "signaling Tx worker %" PRIu64 " into exiting state\n", sess->isid); ISCSI_LOCK(&sess->tx_worker.work_mutex, return -1); iscsi_trace(TRACE_ISCSI_DEBUG, - "signaling socket shutdown to Tx worker %llu\n", sess->isid); + "signaling socket shutdown to Tx worker %" PRIu64 "\n", sess->isid); if (iscsi_sock_shutdown(sess->sock, 1) != 0) { iscsi_err(__FILE__, __LINE__, "iscsi_sock_shutdown() failed\n"); @@ -376,7 +376,7 @@ session_destroy_i(initiator_session_t * ISCSI_WORKER_STATE_EXITING) { ISCSI_SPIN; } - iscsi_trace(TRACE_ISCSI_DEBUG, "Tx worker %llu has exited\n", + iscsi_trace(TRACE_ISCSI_DEBUG, "Tx worker %" PRIu64 " has exited\n", sess->isid); } else { iscsi_trace(TRACE_ISCSI_DEBUG, @@ -395,11 +395,11 @@ session_destroy_i(initiator_session_t * if (sess->rx_worker.state & ISCSI_WORKER_STATE_STARTED) { if (sess->rx_worker.state & ISCSI_WORKER_STATE_EXITING) { iscsi_trace(TRACE_ISCSI_DEBUG, - "Rx worker %llu already signalled for exit\n", + "Rx worker %" PRIu64 " already signalled for exit\n", sess->isid); } else { iscsi_trace(TRACE_ISCSI_DEBUG, - "signaling Rx worker %llu into exiting state\n", sess->isid); + "signaling Rx worker %" PRIu64 " into exiting state\n", sess->isid); if (iscsi_sock_shutdown(sess->sock, 0) != 0) { iscsi_err(__FILE__, __LINE__, "iscsi_sock_shutdown() failed\n"); @@ -411,7 +411,7 @@ session_destroy_i(initiator_session_t * ISCSI_WORKER_STATE_EXITING) { ISCSI_SPIN; } - iscsi_trace(TRACE_ISCSI_DEBUG, "Rx worker %llu has exited\n", + iscsi_trace(TRACE_ISCSI_DEBUG, "Rx worker %" PRIu64 " has exited\n", sess->isid); } else { iscsi_trace(TRACE_ISCSI_DEBUG, @@ -561,7 +561,7 @@ full_feature_negotiation_phase_i(initiat /* Enqueue initiator command to Tx worker */ iscsi_trace(TRACE_ISCSI_DEBUG, - "enqueing text command to tx worker %llu\n", + "enqueing text command to tx worker %" PRIu64 "\n", sess->isid); ISCSI_LOCK(&iwait.mutex, FFN_ERROR); ISCSI_LOCK(&sess->tx_worker.work_mutex, FFN_ERROR); @@ -1091,7 +1091,7 @@ initiator_abort(initiator_cmd_t * cmd) initiator_cmd_t *ptr, *prev; initiator_session_t *sess; - iscsi_err(__FILE__, __LINE__, "aborting iSCSI cmd 0x%p (type %d, isid %llu)\n", + iscsi_err(__FILE__, __LINE__, "aborting iSCSI cmd 0x%p (type %d, isid %" PRIu64 ")\n", cmd, cmd->type, cmd->isid); hash_remove(&g_tag_hash, cmd->key); @@ -1123,7 +1123,7 @@ initiator_abort(initiator_cmd_t * cmd) return -1; } } - iscsi_err(__FILE__, __LINE__, "successfully aborted iSCSI cmd 0x%p (type %d, isid %llu)\n", + iscsi_err(__FILE__, __LINE__, "successfully aborted iSCSI cmd 0x%p (type %d, isid %" PRIu64 ")\n", cmd, cmd->type, cmd->isid); return 0; } @@ -1171,7 +1171,7 @@ initiator_enqueue(initiator_cmd_t * cmd) uint32_t tag; if ((target = cmd->isid) >= CONFIG_INITIATOR_NUM_TARGETS) { - iscsi_err(__FILE__, __LINE__, "target (%d) out of range [0..%d]\n", target, CONFIG_INITIATOR_NUM_TARGETS); + iscsi_err(__FILE__, __LINE__, "target (%" PRIu64 ") out of range [0..%d]\n", target, CONFIG_INITIATOR_NUM_TARGETS); return -1; } sess = g_target[(int)target].sess; @@ -1205,7 +1205,7 @@ initiator_enqueue(initiator_cmd_t * cmd) ISCSI_LOCK(&sess->tx_worker.work_mutex, return -1); ISCSI_SIGNAL(&sess->tx_worker.work_cond, return -1); ISCSI_UNLOCK(&sess->tx_worker.work_mutex, return -1); - iscsi_trace(TRACE_ISCSI_DEBUG, "initiator_cmd_t 0x%p given to tx_worker[%llu]\n", cmd, cmd->isid); + iscsi_trace(TRACE_ISCSI_DEBUG, "initiator_cmd_t 0x%p given to tx_worker[%" PRIu64 "]\n", cmd, cmd->isid); } else { /* @@ -1263,7 +1263,7 @@ enqueue_worker_proc(void *arg) } ISCSI_SET_TAG(&tag); target = cmd->isid; - iscsi_trace(TRACE_ISCSI_CMD, "enqueue_worker: dequeued initiator_cmd_t 0x%p (type %d, target %llu)\n", cmd, cmd->type, target); + iscsi_trace(TRACE_ISCSI_CMD, "enqueue_worker: dequeued initiator_cmd_t 0x%p (type %d, target %" PRIu64 ")\n", cmd, cmd->type, target); switch (cmd->type) { case ISCSI_SCSI_CMD: scsi_cmd = (iscsi_scsi_cmd_args_t *) cmd->ptr; @@ -1283,14 +1283,14 @@ enqueue_worker_proc(void *arg) /* Initialize session (if not already) */ initialize: if (!g_target[(int)target].has_session) { - iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: initializing target %llu session\n", target); + iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: initializing target %" PRIu64 " session\n", target); if (session_init_i(&g_target[(int)target].sess, target) != 0) { iscsi_err(__FILE__, __LINE__, "session_init_i() failed (ignoring command)\n"); goto next; } - iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: target %llu session initialized\n", target); + iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: target %" PRIu64 " session initialized\n", target); } else { - iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: target %llu session already initialized\n", target); + iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: target %" PRIu64 " session already initialized\n", target); } sess = g_target[(int)target].sess; iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: session 0x%p\n", sess); @@ -1298,7 +1298,7 @@ initialize: /* Discovery login if TargetName is zero length */ if (strlen(g_target[(int)target].TargetName) == 0) { - iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: entering Discovery phase with target %llu\n", target); + iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: entering Discovery phase with target %" PRIu64 "\n", target); rc = discovery_phase((int)target, &g_target[(int)target].all_targets); iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: Discovery phase complete\n"); @@ -1331,12 +1331,12 @@ initialize: /* Get into full feature if we're not already */ if (sess->state != INITIATOR_SESSION_STATE_LOGGED_IN_NORMAL) { - iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: entering full feature with target %llu (sock %#x)\n", target, (int) sess->sock); + iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: entering full feature with target %" PRIu64 " (sock %#x)\n", target, (int) sess->sock); if (full_feature_phase(sess) != 0) { iscsi_err(__FILE__, __LINE__, "enqueue_worker: full_feature_phase() failed (ignoring command)\n"); goto next; } else { - iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: now full feature with target %llu\n", target); + iscsi_trace(TRACE_ISCSI_DEBUG, "enqueue_worker: now full feature with target %" PRIu64 "\n", target); } } /* @@ -1356,7 +1356,7 @@ initialize: } ISCSI_SIGNAL(&sess->tx_worker.work_cond, goto done); ISCSI_UNLOCK(&sess->tx_worker.work_mutex, goto done); - iscsi_trace(TRACE_ISCSI_CMD, "enqueue_worker: gave initiator_cmd_t 0x%p to tx_worker[%llu]\n", cmd, cmd->isid); + iscsi_trace(TRACE_ISCSI_CMD, "enqueue_worker: gave initiator_cmd_t 0x%p to tx_worker[%" PRIu64 "]\n", cmd, cmd->isid); next: ISCSI_LOCK(&g_enqueue_worker.work_mutex, goto done); } else { @@ -1465,13 +1465,13 @@ tx_worker_proc_i(void *arg) ISCSI_UNLOCK(&me->work_mutex, return -1); iscsi_trace(TRACE_ISCSI_CMD, "tx_worker[%d]: dequeued initiator_cmd_t 0x%p " - "(type %d, target %llu)\n", + "(type %d, target %" PRIu64 ")\n", me->id, cmd, cmd->type, cmd->isid); /* Make sure we've got the right command */ if (cmd->isid != (unsigned)me->id) { iscsi_err(__FILE__, __LINE__, - "got command %#x for target %llu, " + "got command %#x for target %" PRIu64 ", " "expected %d\n", cmd->type, cmd->isid, me->id); goto done; @@ -1902,7 +1902,7 @@ logout_phase_i(initiator_session_t * ses /* Enqueue to Tx worker */ - iscsi_trace(TRACE_ISCSI_DEBUG, "enqueing logout command to tx worker %llu\n", sess->isid); + iscsi_trace(TRACE_ISCSI_DEBUG, "enqueing logout command to tx worker %" PRIu64 "\n", sess->isid); ISCSI_LOCK(&iwait.mutex, LO_ERROR); ISCSI_LOCK(&sess->tx_worker.work_mutex, LO_ERROR); if (iscsi_queue_insert(&sess->tx_queue, cmd) == -1) { @@ -2016,7 +2016,7 @@ login_phase_i(initiator_session_t * sess /* Enqueue initiator command to Tx worker */ - iscsi_trace(TRACE_ISCSI_DEBUG, "enqueing login command to tx worker %llu\n", sess->isid); + iscsi_trace(TRACE_ISCSI_DEBUG, "enqueing login command to tx worker %" PRIu64 "\n", sess->isid); ISCSI_LOCK(&iwait.mutex, LI_ERROR); ISCSI_LOCK(&sess->tx_worker.work_mutex, LI_ERROR); if (iscsi_queue_insert(&sess->tx_queue, cmd) == -1) { @@ -2284,8 +2284,7 @@ login_response_i(initiator_session_t * s } if (login_rsp.isid != login_cmd->isid) { iscsi_err(__FILE__, __LINE__, - "Bad \"ISID\": %" PRIu64 "u != %" - PRIu64 "u.\n", + "Bad \"ISID\": %uu != %uu.\n", (unsigned)login_rsp.isid, (unsigned)login_cmd->isid); LIR_ERROR; @@ -2324,7 +2323,7 @@ login_response_i(initiator_session_t * s iscsi_trace(TRACE_ISCSI_DEBUG, "*********************************************\n"); iscsi_trace(TRACE_ISCSI_DEBUG, "* LOGIN SUCCESSFUL *\n"); iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20u *\n", "CID", sess->cid); - iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20llu *\n", "ISID", sess->isid); + iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20" PRIu64 " *\n", "ISID", sess->isid); iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20u *\n", "TSIH", sess->tsih); iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20u *\n", "CmdSN", sess->CmdSN); iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20u *\n", "MaxCmdSN", sess->MaxCmdSN); @@ -2469,7 +2468,7 @@ callback: iscsi_trace(TRACE_ISCSI_DEBUG, "*********************************************\n"); iscsi_trace(TRACE_ISCSI_DEBUG, "* LOGOUT SUCCESSFUL *\n"); iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20u *\n", "CID", sess->cid); - iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20llu *\n", "ISID", sess->isid); + iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20" PRIu64 " *\n", "ISID", sess->isid); iscsi_trace(TRACE_ISCSI_DEBUG, "* %20s:%20u *\n", "TSIH", sess->tsih); iscsi_trace(TRACE_ISCSI_DEBUG, "*********************************************\n"); @@ -2549,7 +2548,7 @@ scsi_command_i(initiator_cmd_t * cmd) sg_len = sg_len_copy = sg_len_which = 0; scsi_cmd->status = 0; - iscsi_trace(TRACE_ISCSI_DEBUG, "tx_worker[%llu]: scsi op %#x lun %llu trans_len %d length %d send_sg_len %d recv_sg_len %d\n", target, scsi_cmd->cdb[0], scsi_cmd->lun, scsi_cmd->trans_len, scsi_cmd->length, scsi_cmd->send_sg_len, scsi_cmd->recv_sg_len); + iscsi_trace(TRACE_ISCSI_DEBUG, "tx_worker[%" PRIu64 "]: scsi op %#x lun %" PRIu64 " trans_len %d length %d send_sg_len %d recv_sg_len %d\n", target, scsi_cmd->cdb[0], scsi_cmd->lun, scsi_cmd->trans_len, scsi_cmd->length, scsi_cmd->send_sg_len, scsi_cmd->recv_sg_len); if ((uint32_t)target > CONFIG_INITIATOR_NUM_TARGETS) { iscsi_err(__FILE__, __LINE__, "target %u\n", @@ -3282,7 +3281,7 @@ scsi_response_i(initiator_session_t * se errmsg = "StatSN"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return -1; } @@ -3455,10 +3454,10 @@ scsi_read_data_i(initiator_session_t * s errmsg = "Residual Count"; } } else { - iscsi_warn(__FILE__, __LINE__, "Underflow %s\n", data.res_count); + iscsi_warn(__FILE__, __LINE__, "Underflow %" PRIu32 "\n", data.res_count); } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return -1; } Index: src/external/bsd/iscsi/dist/src/lib/protocol.c diff -u src/external/bsd/iscsi/dist/src/lib/protocol.c:1.2 src/external/bsd/iscsi/dist/src/lib/protocol.c:1.2.6.1 --- src/external/bsd/iscsi/dist/src/lib/protocol.c:1.2 Tue Feb 22 13:10:55 2011 +++ src/external/bsd/iscsi/dist/src/lib/protocol.c Sat Mar 17 17:48:48 2012 @@ -133,7 +133,7 @@ iscsi_task_cmd_decap(uint8_t *header, is errmsg = "Bytes 40-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -211,7 +211,7 @@ iscsi_task_rsp_decap(uint8_t *header, is errmsg = "Bytes 36-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -287,7 +287,7 @@ iscsi_nop_out_decap(uint8_t *header, isc errmsg = "Bytes 32-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -364,7 +364,7 @@ iscsi_nop_in_decap(uint8_t *header, iscs errmsg = "Bytes 36-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -452,7 +452,7 @@ iscsi_text_cmd_decap(uint8_t *header, is errmsg = "Bytes 32-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -540,7 +540,7 @@ iscsi_text_rsp_decap(uint8_t *header, is errmsg = "Bytes 36-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -657,7 +657,7 @@ iscsi_login_cmd_decap(uint8_t *header, i errmsg = "Bytes 32-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -783,7 +783,7 @@ iscsi_login_rsp_decap(uint8_t *header, i errmsg = "Bytes 40-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -862,7 +862,7 @@ iscsi_logout_cmd_decap(uint8_t *header, errmsg = "Bytes 32-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -940,7 +940,7 @@ iscsi_logout_rsp_decap(uint8_t *header, errmsg = "Bytes 44-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -1041,7 +1041,7 @@ iscsi_scsi_cmd_decap(uint8_t *header, is errmsg = "Byte 3"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -1157,7 +1157,7 @@ iscsi_scsi_rsp_decap(uint8_t *header, is errmsg = "overflow"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -1252,7 +1252,7 @@ iscsi_r2t_decap(uint8_t *header, iscsi_r errmsg = "Bytes 4-15"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -1339,7 +1339,7 @@ iscsi_write_data_decap(uint8_t *header, errmsg = "Bytes 44-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -1461,7 +1461,7 @@ iscsi_read_data_decap(uint8_t *header, i errmsg = "Bytes 44-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; } @@ -1546,7 +1546,7 @@ iscsi_reject_decap(uint8_t *header, iscs errmsg = "Bytes 40-47"; } if (errmsg) { - iscsi_err(__FILE__, __LINE__, errmsg); + iscsi_err(__FILE__, __LINE__, "%s", errmsg); NO_CLEANUP; return 1; }