From: Sage Weil <sage@newdream.net>
Date: Fri, 7 May 2010 21:55:31 +0000 (-0700)
Subject: types: clean up printf format warnings
X-Git-Tag: v0.20.2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d84c890d76a245ea5d645ee8d6af4d1feb519e9;p=ceph.git

types: clean up printf format warnings

bah
---

diff --git a/src/client/test_ioctls.c b/src/client/test_ioctls.c
index 9cf27550091..1792084fa6c 100644
--- a/src/client/test_ioctls.c
+++ b/src/client/test_ioctls.c
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	printf("layout:\n stripe_unit %lld\n stripe_count %lld\n object_size %lld\n data_pool %lld\npreferred osd %lld\n",
-	       l.stripe_unit, l.stripe_count, l.object_size, l.data_pool, l.preferred_osd);
+	       (long long)l.stripe_unit, (long long)l.stripe_count, (long long)l.object_size, (long long)l.data_pool, (long long)l.preferred_osd);
 
 	/* dataloc */
 	dl.file_offset = atoll(argv[2]);
@@ -51,15 +51,15 @@ int main(int argc, char **argv)
 	}
 
 	printf("dataloc:\n");
-	printf(" file_offset %lld (of object start)\n", dl.file_offset);
+	printf(" file_offset %lld (of object start)\n", (long long)dl.file_offset);
 	printf(" object '%s'\n object_offset %lld\n object_size %lld object_no %lld\n",
-	       dl.object_name, dl.object_offset, dl.object_size, dl.object_no);
+	       dl.object_name, (long long)dl.object_offset, (long long)dl.object_size, (long long)dl.object_no);
 	printf(" block_offset %lld\n block_size %lld\n",
-	       dl.block_offset, dl.block_size);
+	       (long long)dl.block_offset, (long long)dl.block_size);
 
 	char buf[80];
 	getnameinfo((struct sockaddr *)&dl.osd_addr, sizeof(dl.osd_addr), buf, sizeof(buf), 0, 0, NI_NUMERICHOST);
-	printf(" osd%lld %s\n", dl.osd, buf);
+	printf(" osd%lld %s\n", (long long)dl.osd, buf);
 
 	return 0;	
 }
diff --git a/src/testrados.c b/src/testrados.c
index 0a6f94f7339..7dfae30fecd 100644
--- a/src/testrados.c
+++ b/src/testrados.c
@@ -43,11 +43,11 @@ int main(int argc, const char **argv)
   for (i=0; i<r; i++) {
     char name[100];
     rados_snap_get_name(pool, snaps[i], name, sizeof(name));
-    printf("rados_snap_list got snap %lld %s\n", snaps[i], name);
+    printf("rados_snap_list got snap %lld %s\n", (long long)snaps[i], name);
   }
   rados_snap_t snapid;
   r = rados_snap_lookup(pool, "snap1", &snapid);
-  printf("rados_snap_lookup snap1 got %lld, result %d\n", snapid, r);
+  printf("rados_snap_lookup snap1 got %lld, result %d\n", (long long)snapid, r);
   r = rados_snap_remove(pool, "snap1");
   printf("rados_snap_remove snap1 = %d\n", r);
 
@@ -73,10 +73,10 @@ int main(int argc, const char **argv)
   if (memcmp(val, "bar", 3))
     printf("*** attr value mismatch ***\n");
 
-  __u64 size;
+  uint64_t size;
   time_t mtime;
   r = rados_stat(pool, oid, &size, &mtime);
-  printf("rados_stat size = %lld mtime = %d = %d\n", size, (int)mtime, r);
+  printf("rados_stat size = %lld mtime = %d = %d\n", (long long)size, (int)mtime, r);
 
   /* tmap */