change LP64 ifdefs to casts for printf formatting

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index 623b5b158a9b91589661a824603eba6945c9e0d6..01359c91a889949213b88e9103d10136a98e5484 100644 (file)
--- 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 1bf0a1c910237de006449872f9dc5854d6fbbb57..a56aa6bc9b5e27ff2c9bf6f3e4d611088b4ddf2f 100644 (file)
--- 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);
   }