[Cluster-devel] cluster/group/gfs_controld cpg.c plock.c

[Cluster-devel] cluster/group/gfs_controld cpg.c plock.c

[teigland]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	teigland at sourceware.org	2007-07-18 20:35:51

Modified files:
	group/gfs_controld: cpg.c plock.c 

Log message:
	recent cleanup of warnings should have specified unsigned in long long
	casts

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/cpg.c.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/plock.c.diff?cvsroot=cluster&r1=1.32&r2=1.33

--- cluster/group/gfs_controld/cpg.c	2007/07/11 17:01:23	1.12
+++ cluster/group/gfs_controld/cpg.c	2007/07/18 20:35:50	1.13
@@ -222,7 +222,7 @@
 	}
 	if (error != CPG_OK) {
 		log_error("cpg_mcast_joined error %d handle %llx %s",
-			  error, (long long)h, msg_name(type));
+			  error, (unsigned long long)h, msg_name(type));
 		return -1;
 	}
 
--- cluster/group/gfs_controld/plock.c	2007/07/11 17:01:23	1.32
+++ cluster/group/gfs_controld/plock.c	2007/07/18 20:35:50	1.33
@@ -386,11 +386,11 @@
 	}
 
 	log_plock(mg, "read plock %llx %s %s %llx-%llx %d/%u/%llx w %d",
-		  (long long)info.number,
+		  (unsigned long long)info.number,
 		  op_str(info.optype),
 		  ex_str(info.optype, info.ex),
-		  (long long)info.start, (long long)info.end,
-		  info.nodeid, info.pid, (long long)info.owner,
+		  (unsigned long long)info.start, (unsigned long long)info.end,
+		  info.nodeid, info.pid, (unsigned long long)info.owner,
 		  info.wait);
 
 	/* report plock rate and any delays since the last report */
@@ -960,11 +960,11 @@
 	info_bswap_in(&info);
 
 	log_plock(mg, "receive plock %llx %s %s %llx-%llx %d/%u/%llx w %d",
-		  (long long)info.number,
+		  (unsigned long long)info.number,
 		  op_str(info.optype),
 		  ex_str(info.optype, info.ex),
-		  (long long)info.start, (long long)info.end,
-		  info.nodeid, info.pid, (long long)info.owner,
+		  (unsigned long long)info.start, (unsigned long long)info.end,
+		  info.nodeid, info.pid, (unsigned long long)info.owner,
 		  info.wait);
 
 	plock_recv_count++;
@@ -1141,7 +1141,7 @@
 	int ret = 0;
 
 	h = (SaCkptCheckpointHandleT) mg->cp_handle;
-	log_group(mg, "unlink ckpt %llx", (long long)h);
+	log_group(mg, "unlink ckpt %llx", (unsigned long long)h);
 
  unlink_retry:
 	rv = saCkptCheckpointUnlink(ckpt_handle, name);
@@ -1170,9 +1170,9 @@
 
 	log_group(mg, "unlink ckpt status: size %llu, max sections %u, "
 		      "max section size %llu, section count %u, mem %u",
-		 (long long)s.checkpointCreationAttributes.checkpointSize,
+		 (unsigned long long)s.checkpointCreationAttributes.checkpointSize,
 		 s.checkpointCreationAttributes.maxSections,
-		 (long long)s.checkpointCreationAttributes.maxSectionSize,
+		 (unsigned long long)s.checkpointCreationAttributes.maxSectionSize,
 		 s.numberOfSections, s.memoryUsed);
 
  out_close:
@@ -1187,7 +1187,7 @@
 	}
 	if (rv != SA_AIS_OK) {
 		log_error("unlink ckpt %llx close err %d %s",
-			  (long long)h, rv, mg->name);
+			  (unsigned long long)h, rv, mg->name);
 		/* should we return an error here and possibly cause
 		   store_plocks() to fail on this? */
 		/* ret = -1; */
@@ -1314,12 +1314,13 @@
 		return;
 	}
 
-	log_group(mg, "store_plocks: open ckpt handle %llx", (long long)h);
+	log_group(mg, "store_plocks: open ckpt handle %llx",
+		  (unsigned long long)h);
 	mg->cp_handle = (uint64_t) h;
 
 	list_for_each_entry(r, &mg->resources, list) {
 		memset(&buf, 0, 32);
-		len = snprintf(buf, 32, "r%llu", (long long)r->number);
+		len = snprintf(buf, 32, "r%llu", (unsigned long long)r->number);
 
 		section_id.id = (void *)buf;
 		section_id.idLen = len + 1;
@@ -1442,7 +1443,8 @@
 		memset(&buf, 0, 32);
 		snprintf(buf, 32, "%s", desc.sectionId.id);
 		log_group(mg, "retrieve_plocks: section size %llu id %u \"%s\"",
-			  (long long)iov.dataSize, iov.sectionId.idLen, buf);
+			  (unsigned long long)iov.dataSize, iov.sectionId.idLen,
+			  buf);
 
 	 read_retry:
 		rv = saCkptCheckpointRead(h, &iov, 1, NULL);
@@ -1458,7 +1460,7 @@
 		}
 
 		log_group(mg, "retrieve_plocks: ckpt read %llu bytes",
-			  (long long)iov.readSize);
+			  (unsigned long long)iov.readSize);
 		section_len = iov.readSize;
 
 		if (!section_len)
@@ -1551,10 +1553,12 @@
 		list_for_each_entry(po, &r->locks, list) {
 			snprintf(line, MAXLINE,
 			      "%llu %s %llu-%llu nodeid %d pid %u owner %llx\n",
-			      (long long)r->number,
+			      (unsigned long long)r->number,
 			      po->ex ? "WR" : "RD",
-			      (long long)po->start, (long long)po->end,
-			      po->nodeid, po->pid, (long long)po->owner);
+			      (unsigned long long)po->start,
+			      (unsigned long long)po->end,
+			      po->nodeid, po->pid,
+			      (unsigned long long)po->owner);
 
 			rv = do_write(fd, line, strlen(line));
 		}
@@ -1562,11 +1566,12 @@
 		list_for_each_entry(w, &r->waiters, list) {
 			snprintf(line, MAXLINE,
 			      "%llu WAITING %s %llu-%llu nodeid %d pid %u owner %llx\n",
-			      (long long)r->number,
+			      (unsigned long long)r->number,
 			      w->info.ex ? "WR" : "RD",
-			      (long long)w->info.start, (long long)w->info.end,
+			      (unsigned long long)w->info.start,
+			      (unsigned long long)w->info.end,
 			      w->info.nodeid, w->info.pid,
-			      (long long)w->info.owner);
+			      (unsigned long long)w->info.owner);
 
 			rv = do_write(fd, line, strlen(line));
 		}