From: Trond Norbye <trond.norbye@sun.com>
Date: Sun, 14 Jun 2009 11:47:00 +0000 (+0200)
Subject: Fix paren style, and mark replication with the unlikely keyword
X-Git-Tag: 0.31~15^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9124a34c62a7e7c99fa7280596cace7d0bcb131e;p=m6w6%2Flibmemcached

Fix paren style, and mark replication with the unlikely keyword
---

diff --git a/libmemcached/memcached_delete.c b/libmemcached/memcached_delete.c
index 5eb7e39c..93b1eb7a 100644
--- a/libmemcached/memcached_delete.c
+++ b/libmemcached/memcached_delete.c
@@ -129,7 +129,7 @@ static inline memcached_return binary_delete(memcached_st *ptr,
     rc= MEMCACHED_WRITE_FAILURE;
   }
 
-  if (ptr->number_of_replicas > 0) 
+  unlikely (ptr->number_of_replicas > 0) 
   {
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_DELETEQ;
 
diff --git a/libmemcached/memcached_get.c b/libmemcached/memcached_get.c
index cdfb5d29..6ab5b2ff 100644
--- a/libmemcached/memcached_get.c
+++ b/libmemcached/memcached_get.c
@@ -465,7 +465,8 @@ static memcached_return binary_mget_by_key(memcached_st *ptr,
 {
   memcached_return rc;
 
-  if (ptr->number_of_replicas == 0) {
+  if (ptr->number_of_replicas == 0) 
+  {
     rc= simple_binary_mget(ptr, master_server_key, is_master_key_set,
                            keys, key_length, number_of_keys);
   } else {
diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index fe8024d3..713f831d 100644
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -470,7 +470,7 @@ static memcached_return memcached_send_binary(memcached_st *ptr,
     return MEMCACHED_WRITE_FAILURE;
   }
 
-  if (verb == SET_OP && ptr->number_of_replicas > 0) 
+  unlikely (verb == SET_OP && ptr->number_of_replicas > 0) 
   {
     request.message.header.request.opcode= PROTOCOL_BINARY_CMD_SETQ;