p9y: bsd

[awesomized/libmemcached] / src / libmemcachedprotocol / pedantic.c

diff --git a/src/libmemcachedprotocol/pedantic.c b/src/libmemcachedprotocol/pedantic.c
index 85624f2496d6a7a06383e0bb5e3466dcee63a2c9..c966ee8bb8fed9e5ba36d1896f80e8edb9ea92f3 100644 (file)
--- a/src/libmemcachedprotocol/pedantic.c
+++ b/src/libmemcachedprotocol/pedantic.c
@@ -14,8 +14,7 @@
 */
 
 #include "libmemcachedprotocol/common.h"
-
-#include <sys/types.h>
+#include "p9y/socket.hpp"
 
 #define ensure(a) \
   if (!(a)) { \
@@ -139,7 +138,8 @@ bool memcached_binary_protocol_pedantic_check_response(
     case PROTOCOL_BINARY_CMD_SETQ:
       /* Quiet command shouldn't return on success */
       return false;
-    default: break;
+    default:
+      break;
     }
 
     switch (opcode) {
@@ -151,7 +151,7 @@ bool memcached_binary_protocol_pedantic_check_response(
       ensure(response->response.keylen == 0);
       ensure(response->response.extlen == 0);
       ensure(response->response.bodylen == 0);
-      ensure(response->response.cas != 0);
+      ensure(response->response.cas);
       break;
     case PROTOCOL_BINARY_CMD_FLUSH:
     case PROTOCOL_BINARY_CMD_NOOP:
@@ -168,7 +168,7 @@ bool memcached_binary_protocol_pedantic_check_response(
       ensure(response->response.keylen == 0);
       ensure(response->response.extlen == 0);
       ensure(ntohl(response->response.bodylen) == 8);
-      ensure(response->response.cas != 0);
+      ensure(response->response.cas);
       break;
 
     case PROTOCOL_BINARY_CMD_STAT:
@@ -180,7 +180,7 @@ bool memcached_binary_protocol_pedantic_check_response(
     case PROTOCOL_BINARY_CMD_VERSION:
       ensure(response->response.keylen == 0);
       ensure(response->response.extlen == 0);
-      ensure(response->response.bodylen != 0);
+      ensure(response->response.bodylen);
       ensure(response->response.cas == 0);
       break;
 
@@ -188,14 +188,14 @@ bool memcached_binary_protocol_pedantic_check_response(
     case PROTOCOL_BINARY_CMD_GETQ:
       ensure(response->response.keylen == 0);
       ensure(response->response.extlen == 4);
-      ensure(response->response.cas != 0);
+      ensure(response->response.cas);
       break;
 
     case PROTOCOL_BINARY_CMD_GETK:
     case PROTOCOL_BINARY_CMD_GETKQ:
-      ensure(response->response.keylen != 0);
+      ensure(response->response.keylen);
       ensure(response->response.extlen == 4);
-      ensure(response->response.cas != 0);
+      ensure(response->response.cas);
       break;
 
     default: