From 197b949d28bff35a10a10d5d2743fcdfd13ec2c2 Mon Sep 17 00:00:00 2001
From: Shehjar Tikoo <shehjart@gluster.com>
Date: Mon, 21 Sep 2009 05:31:28 +0000
Subject: booster: Fix build warnings

Signed-off-by: Anand V. Avati <avati@dev.gluster.com>

BUG: 275 (libglusterfsclient: Generic build failure bug for libglusterfsclient and booster)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=275
---
 booster/src/booster.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'booster')

diff --git a/booster/src/booster.c b/booster/src/booster.c
index f53772410..ff4da3a1b 100644
--- a/booster/src/booster.c
+++ b/booster/src/booster.c
@@ -649,8 +649,8 @@ pread (int fd, void *buf, size_t count, unsigned long offset)
         ssize_t ret;
         glusterfs_file_t glfs_fd = 0;
 
-        gf_log ("booster", GF_LOG_DEBUG, "pread: fd %d, count %ld, offset %ld",
-                fd, count, offset);
+        gf_log ("booster", GF_LOG_DEBUG, "pread: fd %d, count %lu, offset %lu"
+                ,fd, (long unsigned)count, offset);
         glfs_fd = booster_fdptr_get (booster_fdtable, fd);
         if (!glfs_fd) { 
                 gf_log ("booster", GF_LOG_DEBUG, "Not booster fd");
@@ -675,8 +675,8 @@ pread64 (int fd, void *buf, size_t count, uint64_t offset)
         ssize_t ret;
         glusterfs_file_t glfs_fd = 0;
 
-        gf_log ("booster", GF_LOG_DEBUG, "pread64: fd %d, count %ld, offset"
-                " %ld", fd, count, offset);
+        gf_log ("booster", GF_LOG_DEBUG, "pread64: fd %d, count %lu, offset %"
+                PRIu64, fd, (long unsigned)count, offset);
         glfs_fd = booster_fdptr_get (booster_fdtable, fd);
         if (!glfs_fd) { 
                 gf_log ("booster", GF_LOG_DEBUG, "Not booster fd");
@@ -701,7 +701,8 @@ read (int fd, void *buf, size_t count)
         int ret;
         glusterfs_file_t glfs_fd;
 
-        gf_log ("booster", GF_LOG_DEBUG, "read: fd %d, count %ld", fd, count);
+        gf_log ("booster", GF_LOG_DEBUG, "read: fd %d, count %lu", fd,
+                (long unsigned)count);
         glfs_fd = booster_fdptr_get (booster_fdtable, fd);
         if (!glfs_fd) {
                 gf_log ("booster", GF_LOG_DEBUG, "Not booster fd");
@@ -751,7 +752,7 @@ write (int fd, const void *buf, size_t count)
         int ret;
         glusterfs_file_t glfs_fd = 0;
 
-        gf_log ("booster", GF_LOG_DEBUG, "write: fd %d, count %ld", fd, count);
+        gf_log ("booster", GF_LOG_DEBUG, "write: fd %d, count %d", fd, count);
 
         glfs_fd = booster_fdptr_get (booster_fdtable, fd);
 
@@ -803,8 +804,8 @@ pwrite (int fd, const void *buf, size_t count, unsigned long offset)
         int ret;
         glusterfs_file_t glfs_fd = 0;
 
-        gf_log ("booster", GF_LOG_DEBUG, "pwrite: fd %d, count %ld, offset %ld"
-                , fd, count, offset);
+        gf_log ("booster", GF_LOG_DEBUG, "pwrite: fd %d, count %d, offset %lu",
+                fd, count, offset);
         glfs_fd = booster_fdptr_get (booster_fdtable, fd);
 
         if (!glfs_fd) {
@@ -830,8 +831,8 @@ pwrite64 (int fd, const void *buf, size_t count, uint64_t offset)
         int ret;
         glusterfs_file_t glfs_fd = 0;
 
-        gf_log ("booster", GF_LOG_DEBUG, "pwrite64: fd %d, count %ld, offset"
-                "%ld", fd, count, offset);
+        gf_log ("booster", GF_LOG_DEBUG, "pwrite64: fd %d, count %d, offset %"
+                PRIu64, fd, count, offset);
         glfs_fd = booster_fdptr_get (booster_fdtable, fd);
   
         if (!glfs_fd) {
@@ -1275,8 +1276,8 @@ ftruncate (int fd, off_t length)
         int                     ret = -1;
         glusterfs_file_t        fh = NULL;
 
-        gf_log ("booster", GF_LOG_DEBUG, "ftruncate: fd %d, length: %ld", fd,
-                length);
+        gf_log ("booster", GF_LOG_DEBUG, "ftruncate: fd %d, length: %"PRIu64,fd
+                , length);
         fh = booster_fdptr_get (booster_fdtable, fd);
         if (!fh) {
                 gf_log ("booster", GF_LOG_DEBUG, "Not a booster fd");
@@ -2490,7 +2491,7 @@ sendfile (int out_fd, int in_fd, off_t *offset, size_t count)
         ssize_t                     ret = -1;
 
         gf_log ("booster", GF_LOG_DEBUG, "sendfile: in fd %d, out fd %d, offset"
-                " %ld, count %ld", in_fd, out_fd, offset, count);
+                " %"PRIu64", count %d", in_fd, out_fd, *offset, count);
         /*
          * handle sendfile in booster only if in_fd corresponds to a glusterfs
          * file handle 
@@ -2520,7 +2521,7 @@ sendfile64 (int out_fd, int in_fd, off_t *offset, size_t count)
         ssize_t                     ret = -1;
 
         gf_log ("booster", GF_LOG_DEBUG, "sendfile64: in fd %d, out fd %d,"
-                " offset %ld, count %ld", in_fd, out_fd, offset, count);
+                " offset %"PRIu64", count %d", in_fd, out_fd, *offset, count);
         /*
          * handle sendfile in booster only if in_fd corresponds to a glusterfs
          * file handle 
-- 
cgit