X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcachedprotocol%2Fpedantic.c;h=6b3b27220b499179e50841d7fc71a732985558f6;hb=1a15a0895b863a02d598a317f4c0215edef12dc5;hp=85624f2496d6a7a06383e0bb5e3466dcee63a2c9;hpb=f48bae7d4b6a832b0d3a71812125770f09c76239;p=awesomized%2Flibmemcached

diff --git a/src/libmemcachedprotocol/pedantic.c b/src/libmemcachedprotocol/pedantic.c
index 85624f24..6b3b2722 100644
--- a/src/libmemcachedprotocol/pedantic.c
+++ b/src/libmemcachedprotocol/pedantic.c
@@ -1,6 +1,6 @@
 /*
     +--------------------------------------------------------------------+
-    | libmemcached - C/C++ Client Library for memcached                  |
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
     +--------------------------------------------------------------------+
     | Redistribution and use in source and binary forms, with or without |
     | modification, are permitted under the terms of the BSD license.    |
@@ -9,13 +9,12 @@
     | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
     +--------------------------------------------------------------------+
     | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
-    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
     +--------------------------------------------------------------------+
 */
 
 #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: