From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 9 Oct 2014 15:14:37 +0000 (+0200)
Subject: test_rgw_admin_log.cc: refactor to use calloc()
X-Git-Tag: v0.88~83^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7cb2840e0084aeec2cf4d74aa9acbdfaab9aa574;p=ceph.git

test_rgw_admin_log.cc: refactor to use calloc()

Refactor code to use calloc() instead of malloc() to make
sure the char* TEST_BUCKET_OBJECT_SIZE memory is set to
zero before call put_bucket_obj().

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc
index 2049b254e6cd..7ffea978d78b 100644
--- a/src/test/test_rgw_admin_log.cc
+++ b/src/test/test_rgw_admin_log.cc
@@ -741,7 +741,7 @@ TEST(TestRGWAdmin, datalog_list) {
   sleep(1);
   ASSERT_EQ(0, create_bucket());
   
-  char *bucket_obj = (char *)malloc(TEST_BUCKET_OBJECT_SIZE);
+  char *bucket_obj = (char *)calloc(1, TEST_BUCKET_OBJECT_SIZE);
   ASSERT_TRUE(bucket_obj != NULL);
   EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0);
   sleep(1); 
@@ -980,7 +980,7 @@ TEST(TestRGWAdmin, datalog_trim) {
   
   ASSERT_EQ(0, create_bucket());
 
-  char *bucket_obj = (char *)malloc(TEST_BUCKET_OBJECT_SIZE);
+  char *bucket_obj = (char *)calloc(1, TEST_BUCKET_OBJECT_SIZE);
   ASSERT_TRUE(bucket_obj != NULL);
   EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0);
   ASSERT_EQ(0, delete_obj(TEST_BUCKET_OBJECT));
@@ -1398,7 +1398,7 @@ TEST(TestRGWAdmin, bilog_list) {
 
   ASSERT_EQ(0, create_bucket());
 
-  char *bucket_obj = (char *)malloc(TEST_BUCKET_OBJECT_SIZE);
+  char *bucket_obj = (char *)calloc(1, TEST_BUCKET_OBJECT_SIZE);
   ASSERT_TRUE(bucket_obj != NULL);
   EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0);
   free(bucket_obj);
@@ -1428,7 +1428,7 @@ TEST(TestRGWAdmin, bilog_list) {
   get_bilog_list(entries);
   EXPECT_EQ(2U, entries.size());
 
-  bucket_obj = (char *)malloc(TEST_BUCKET_OBJECT_SIZE);
+  bucket_obj = (char *)calloc(1, TEST_BUCKET_OBJECT_SIZE);
   ASSERT_TRUE(bucket_obj != NULL);
   EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT_1, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0);
   free(bucket_obj);
@@ -1539,7 +1539,7 @@ TEST(TestRGWAdmin, bilog_trim) {
   g_test->send_request(string("DELETE"), rest_req);
   EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/
 
-  char *bucket_obj = (char *)malloc(TEST_BUCKET_OBJECT_SIZE);
+  char *bucket_obj = (char *)calloc(1, TEST_BUCKET_OBJECT_SIZE);
   ASSERT_TRUE(bucket_obj != NULL);
   EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0);
   free(bucket_obj);