LVM2/daemons/clvmd clvmd-openais.c

LVM2/daemons/clvmd clvmd-openais.c

[prajnoha]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2011-02-22 10:01:11

Modified files:
	daemons/clvmd  : clvmd-openais.c 

Log message:
	Remove a few size_t type warnings.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-openais.c.diff?cvsroot=lvm2&r1=1.15&r2=1.16

--- LVM2/daemons/clvmd/clvmd-openais.c	2010/06/21 15:56:58	1.15
+++ LVM2/daemons/clvmd/clvmd-openais.c	2011/02/22 10:01:11	1.16
@@ -227,7 +227,7 @@
 
 	memcpy(&target_nodeid, msg, OPENAIS_CSID_LEN);
 
-	DEBUGLOG("%u got message from nodeid %d for %d. len %d\n",
+	DEBUGLOG("%u got message from nodeid %d for %d. len %" PRIsize_t "\n",
 		 our_nodeid, nodeid, target_nodeid, msg_len-4);
 
 	if (nodeid != our_nodeid)
@@ -245,7 +245,8 @@
 	int i;
 	struct node_info *ninfo;
 
-	DEBUGLOG("confchg callback. %d joined, %d left, %d members\n",
+	DEBUGLOG("confchg callback. %" PRIsize_t " joined, "
+		 "%" PRIsize_t " left, %" PRIsize_t " members\n",
 		 joined_list_entries, left_list_entries, member_list_entries);
 
 	for (i=0; i<joined_list_entries; i++) {

LVM2/daemons/clvmd clvmd-openais.c

[prajnoha]

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2011-03-13 18:08:26

Modified files:
	daemons/clvmd  : clvmd-openais.c 

Log message:
	Remove compile warning for lock_id.
	
	%llx --> PRIx64

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-openais.c.diff?cvsroot=lvm2&r1=1.16&r2=1.17

--- LVM2/daemons/clvmd/clvmd-openais.c	2011/02/22 10:01:11	1.16
+++ LVM2/daemons/clvmd/clvmd-openais.c	2011/03/13 18:08:26	1.17
@@ -509,8 +509,8 @@
 			
 	/* Wait for it to complete */
 
-	DEBUGLOG("lock_resource returning %d, lock_id=%llx\n", err,
-		 lock_id);
+	DEBUGLOG("lock_resource returning %d, lock_id=%" PRIx64 "\n",
+		 err, lock_id);
 
 	linfo->lock_id = lock_id;
 	linfo->res_handle = res_handle;
@@ -531,7 +531,7 @@
 	if (!linfo)
 		return 0;
 
-	DEBUGLOG("unlock_resource: lockid: %llx\n", linfo->lock_id);
+	DEBUGLOG("unlock_resource: lockid: %" PRIx64 "\n", linfo->lock_id);
 	err = saLckResourceUnlock(linfo->lock_id, SA_TIME_END);
 	if (err != SA_AIS_OK)
 	{