Remove compile warnings

Change-Id: I753e512e7669620cbaa33674df8c1fb3d6879efd Reviewed-on: http://review.couchbase.org/19291 Reviewed-by: Matt Ingenthron <matt@couchbase.com> Tested-by: Matt Ingenthron <matt@couchbase.com>
membase · Aug 8, 2012 · b9b0c33 · b9b0c33
1 parent 26bc5f6
commit b9b0c33
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/libmemc.c b/libmemc.c
@@ -678,20 +678,22 @@ static int binary_store(struct Server *server,
     }
 
     protocol_binary_request_set request = {
-        .message.header.request = {
+        .message = {
-            .magic = PROTOCOL_BINARY_REQ,
+            .header.request = {
-            .opcode = opcode,
+                .magic = PROTOCOL_BINARY_REQ,
-            .keylen = htons(keylen),
+                .opcode = opcode,
-            .extlen = 8,
+                .keylen = htons(keylen),
-            .datatype = 0,
+                .extlen = 8,
-            .vbucket = htons(get_vbucket(item->key, keylen)),
+                .datatype = 0,
-            .bodylen = htonl(keylen + item->size + 8),
+                .vbucket = htons(get_vbucket(item->key, keylen)),
-            .opaque = 0,
+                .bodylen = htonl(keylen + item->size + 8),
-            .cas = swap64(item->cas_id)
+                .opaque = 0,
-        },
+                .cas = swap64(item->cas_id)
-        .message.body = {
+            },
-            .flags = 0,
+            .body = {
-            .expiration = htonl(item->exptime)
+                .flags = 0,
+                .expiration = htonl(item->exptime)
+            }
         }
     };
 

diff --git a/main.c b/main.c
@@ -203,6 +203,7 @@ static void get_callback(libcouchbase_t instance,
                          const void *bytes, size_t nbytes,
                          uint32_t flags, uint64_t cas)
 {
+    (void)instance;
     (void)key;
     (void)nkey;
     (void)flags;
@@ -448,7 +449,7 @@ static inline bool memcached_get_wrapper(struct connection *connection,
         libcouchbase_error_t e;
         struct libcouchbase_callback cb;
         char *keys[1];
-        keys[0] = key;
+        keys[0] = (void*)key;
         size_t nkeys[1];
         nkeys[0] = nkey;
 
@@ -903,6 +904,7 @@ static int get_server_rusage(const struct host *entry, struct rusage *rusage)
 
 static void exit_handler(int signum)
 {
+    (void)signum;
     long end_time = (int)time(NULL);
     long time_taken = end_time - start_time;
     long ops_sec = ((float)gets_count + sets_count) / time_taken;