From e5ff1489d4e37f31d73984f4ac4f29b68c8af3b5 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 22 Dec 2009 13:25:46 -0800
Subject: [PATCH] change LP64 ifdefs to casts for printf formatting

---
 src/mds/CInode.cc      |  6 +-----
 src/mon/MonitorStore.h | 24 ++++--------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 623b5b158a9b9..01359c91a8899 100644
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -520,11 +520,7 @@ void CInode::make_anchor_trace(vector<Anchor>& trace)
 void CInode::name_stray_dentry(string& dname)
 {
   char s[20];
-#ifdef __LP64__
-  sprintf(s, "%lx", inode.ino.val);
-#else
-  sprintf(s, "%llx", inode.ino.val);
-#endif
+  sprintf(s, "%llx", (unsigned long long)inode.ino.val);
   dname = s;
 }
 
diff --git a/src/mon/MonitorStore.h b/src/mon/MonitorStore.h
index 1bf0a1c910237..a56aa6bc9b5e2 100644
--- a/src/mon/MonitorStore.h
+++ b/src/mon/MonitorStore.h
@@ -51,40 +51,24 @@ public:
   }
   bool exists_bl_sn(const char *a, version_t b) {
     char bs[20];
-#ifdef __LP64__
-    sprintf(bs, "%lu", b);
-#else
-    sprintf(bs, "%llu", b);
-#endif
+    sprintf(bs, "%llu", (unsigned long long)b);
     return exists_bl_ss(a, bs);
   }
   int get_bl_sn(bufferlist& bl, const char *a, version_t b) {
     char bs[20];
-#ifdef __LP64__
-    sprintf(bs, "%lu", b);
-#else
-    sprintf(bs, "%llu", b);
-#endif
+    sprintf(bs, "%llu", (unsigned long long)b);
     return get_bl_ss(bl, a, bs);
   }
   int put_bl_sn(bufferlist& bl, const char *a, version_t b, bool sync=true) {
     char bs[20];
-#ifdef __LP64__
-    sprintf(bs, "%lu", b);
-#else
-    sprintf(bs, "%llu", b);
-#endif
+    sprintf(bs, "%llu", (unsigned long long)b);
     return put_bl_ss(bl, a, bs, sync);
   }
 
   int erase_ss(const char *a, const char *b);
   int erase_sn(const char *a, version_t b) {
     char bs[20];
-#ifdef __LP64__
-    sprintf(bs, "%lu", b);
-#else
-    sprintf(bs, "%llu", b);
-#endif
+    sprintf(bs, "%llu", (unsigned long long)b);
     return erase_ss(a, bs);
   }
 
-- 
2.39.5