From: Brad Hubbard <bhubbard@redhat.com>
Date: Sat, 13 Jan 2018 22:39:40 +0000 (+1000)
Subject: c_read_operations.cc: Silence tautological-compare compiler warning
X-Git-Tag: v13.0.2~384^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19953%2Fhead;p=ceph.git

c_read_operations.cc: Silence tautological-compare compiler warning

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/test/librados/c_read_operations.cc b/src/test/librados/c_read_operations.cc
index f5713302d82d..4ca5e21f99ff 100644
--- a/src/test/librados/c_read_operations.cc
+++ b/src/test/librados/c_read_operations.cc
@@ -1,14 +1,18 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // Tests for the C API coverage of atomic read operations
 
+#include <cstring> // For memcpy
 #include <errno.h>
 #include <string>
 
+#include "include/buffer.h"
+#include "include/denc.h"
 #include "include/err.h"
 #include "include/rados/librados.h"
-#include "test/librados/test.h"
-#include "test/librados/TestCase.h"
+#include "include/rbd/features.h" // For RBD_FEATURES_ALL
 #include "include/scope_guard.h"
+#include "test/librados/TestCase.h"
+#include "test/librados/test.h"
 
 const char *data = "testdata";
 const char *obj = "testobj";
@@ -470,7 +474,11 @@ TEST_F(CReadOpsTest, Exec) {
   uint64_t features;
   EXPECT_EQ(sizeof(features), bytes_read);
   // make sure buffer is at least as long as it claims
-  ASSERT_TRUE(out[bytes_read-1] == out[bytes_read-1]);
+  bufferlist bl;
+  bl.append(out, bytes_read);
+  auto it = bl.begin();
+  ceph::decode(features, it);
+  ASSERT_EQ(RBD_FEATURES_ALL, features);
   rados_buffer_free(out);
 
   remove_object();