From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 15 Jun 2009 00:51:32 +0000 (-0700)
Subject: Fixed solaris warnings/errors.
X-Git-Tag: 0.31~14^2~7^2~4
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=469a069004a24764960f98b0fd6101ce84199733;p=m6w6%2Flibmemcached

Fixed solaris warnings/errors.
---

diff --git a/libmemcached/memcached_hash.c b/libmemcached/memcached_hash.c
index 5d73611c..5deb5c75 100644
--- a/libmemcached/memcached_hash.c
+++ b/libmemcached/memcached_hash.c
@@ -2,8 +2,8 @@
 
 
 /* Defines */
-static uint64_t FNV_64_INIT= 0xcbf29ce484222325LL;
-static uint64_t FNV_64_PRIME= 0x100000001b3LL;
+static uint64_t FNV_64_INIT= UINT64_C(0xcbf29ce484222325);
+static uint64_t FNV_64_PRIME= UINT64_C(0x100000001b3);
 
 static uint32_t FNV_32_INIT= 2166136261UL;
 static uint32_t FNV_32_PRIME= 16777619;
@@ -143,7 +143,6 @@ static uint32_t dispatch_host(memcached_st *ptr, uint32_t hash)
         right= begin;
       return right->index;
     } 
-    break;
   case MEMCACHED_DISTRIBUTION_MODULA:
     return hash % ptr->number_of_hosts;
   case MEMCACHED_DISTRIBUTION_RANDOM:
diff --git a/libmemcached/memcached_response.c b/libmemcached/memcached_response.c
index 32321c23..1ea0c725 100644
--- a/libmemcached/memcached_response.c
+++ b/libmemcached/memcached_response.c
@@ -395,13 +395,11 @@ static memcached_return binary_read_one_response(memcached_server_st *ptr,
         WATCHPOINT_ASSERT(bodylen == 0);
         return MEMCACHED_SUCCESS;
       } 
-      break;
     case PROTOCOL_BINARY_CMD_NOOP:
       {
         WATCHPOINT_ASSERT(bodylen == 0);
         return MEMCACHED_END;
       }
-      break;
     case PROTOCOL_BINARY_CMD_STAT:
       {
         if (bodylen == 0)
diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index f18b6d89..dd7e23b0 100644
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -37,7 +37,7 @@ static char *storage_op_string(memcached_storage_action verb)
     return "cas ";
   default:
     return "tosserror"; /* This is impossible, fixes issue for compiler warning in VisualStudio */
-  };
+  }
 
   /* NOTREACHED */
 }
diff --git a/libmemcached/memcached_strerror.c b/libmemcached/memcached_strerror.c
index e643db2b..b25bdb36 100644
--- a/libmemcached/memcached_strerror.c
+++ b/libmemcached/memcached_strerror.c
@@ -82,5 +82,5 @@ char *memcached_strerror(memcached_st *ptr __attribute__((unused)), memcached_re
     return "Gibberish returned!";
   default:
     return "Gibberish returned!";
-  };
+  }
 }