Module Name: src
Committed By: riz
Date: Sun May 27 16:50:32 UTC 2012
Modified Files:
src/sbin/iscsid: iscsid_driverif.c iscsid_lists.c iscsid_targets.c
Log Message:
Don't try to print pointers as integers, use %p instead and don't cast.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/iscsid/iscsid_driverif.c \
src/sbin/iscsid/iscsid_lists.c src/sbin/iscsid/iscsid_targets.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/iscsid/iscsid_driverif.c
diff -u src/sbin/iscsid/iscsid_driverif.c:1.3 src/sbin/iscsid/iscsid_driverif.c:1.4
--- src/sbin/iscsid/iscsid_driverif.c:1.3 Sun Nov 20 01:23:57 2011
+++ src/sbin/iscsid/iscsid_driverif.c Sun May 27 16:50:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_driverif.c,v 1.3 2011/11/20 01:23:57 agc Exp $ */
+/* $NetBSD: iscsid_driverif.c,v 1.4 2012/05/27 16:50:32 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -192,8 +192,8 @@ make_connection(session_t * sess, iscsid
struct hostent *host;
initiator_t *init;
- DEB(9, ("Make Connection sess=%x, req=%x, res=%x, stid=%x\n",
- (int) sess, (int) req, (int) res, (int) stid));
+ DEB(9, ("Make Connection sess=%p, req=%p, res=%p, stid=%p\n",
+ sess, req, res, stid));
(void) memset(&loginp, 0x0, sizeof(loginp));
(void) memset(&serverAddress, 0x0, sizeof(serverAddress));
Index: src/sbin/iscsid/iscsid_lists.c
diff -u src/sbin/iscsid/iscsid_lists.c:1.3 src/sbin/iscsid/iscsid_lists.c:1.4
--- src/sbin/iscsid/iscsid_lists.c:1.3 Sun Nov 20 01:23:57 2011
+++ src/sbin/iscsid/iscsid_lists.c Sun May 27 16:50:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_lists.c,v 1.3 2011/11/20 01:23:57 agc Exp $ */
+/* $NetBSD: iscsid_lists.c,v 1.4 2012/05/27 16:50:32 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -256,10 +256,10 @@ find_portal_by_addr(target_t * target, i
TAILQ_FOREACH(curr, &list[PORTAL_LIST].list, link) {
p = (void *)curr;
- DEB(10, ("Find_portal_by_addr - addr %s port %d target %x\n",
+ DEB(10, ("Find_portal_by_addr - addr %s port %d target %p\n",
p->addr.address,
p->addr.port,
- (int) p->target));
+ p->target));
if (strcmp((char *)p->addr.address, (char *)addr->address) == 0 &&
(!addr->port || p->addr.port == addr->port) &&
Index: src/sbin/iscsid/iscsid_targets.c
diff -u src/sbin/iscsid/iscsid_targets.c:1.3 src/sbin/iscsid/iscsid_targets.c:1.4
--- src/sbin/iscsid/iscsid_targets.c:1.3 Sun Nov 20 01:23:57 2011
+++ src/sbin/iscsid/iscsid_targets.c Sun May 27 16:50:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_targets.c,v 1.3 2011/11/20 01:23:57 agc Exp $ */
+/* $NetBSD: iscsid_targets.c,v 1.4 2012/05/27 16:50:32 riz Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -114,7 +114,7 @@ create_portal(target_t *target, iscsi_po
TAILQ_INSERT_TAIL(&list[PORTAL_LIST].list, &portal->entry, link);
list[PORTAL_LIST].num_entries++;
- DEB(9, ("create_portal returns %x\n", (int) portal));
+ DEB(9, ("create_portal returns %p\n", portal));
return portal;
}
