From: Casey Bodley Date: Thu, 30 Jul 2015 20:50:53 +0000 (-0400) Subject: c++11: fixes for preprocessor string concatenation X-Git-Tag: v9.1.0~419^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11a5d2929950829cf35fe8fff36abaaf1aa8ee22;p=ceph.git c++11: fixes for preprocessor string concatenation c++11 adds user-defined literals through type suffixes. for example, "foo"s is a literal of type std::basic_string. this means that any non-whitespace characters following a string literal will be interpreted as a suffix. this causes issues with string concatenation done by the preprocessor, which can only be resolved by adding whitespace Signed-off-by: Casey Bodley --- diff --git a/src/rbd_fuse/rbd-fuse.cc b/src/rbd_fuse/rbd-fuse.cc index 58d3e2a5e187..8da91e3fda46 100644 --- a/src/rbd_fuse/rbd-fuse.cc +++ b/src/rbd_fuse/rbd-fuse.cc @@ -351,7 +351,7 @@ static int rbdfs_write(const char *path, const char *buf, size_t size, if ((size_t)(offset + size) > rbdsize(fi->fh)) { int r; - fprintf(stderr, "rbdfs_write resizing %s to 0x%"PRIxMAX"\n", + fprintf(stderr, "rbdfs_write resizing %s to 0x%" PRIxMAX "\n", path, offset+size); r = rbd_resize(rbd->image, offset+size); if (r < 0) @@ -562,7 +562,8 @@ rbdfs_truncate(const char *path, off_t size) return -ENOENT; rbd = &opentbl[fd]; - fprintf(stderr, "truncate %s to %"PRIdMAX" (0x%"PRIxMAX")\n", path, size, size); + fprintf(stderr, "truncate %s to %" PRIdMAX " (0x%" PRIxMAX ")\n", + path, size, size); r = rbd_resize(rbd->image, size); if (r < 0) return r; @@ -605,7 +606,7 @@ rbdfs_setxattr(const char *path, const char *name, const char *value, for (ap = attrs; ap->attrname != NULL; ap++) { if (strcmp(name, ap->attrname) == 0) { *ap->attrvalp = strtoull(value, NULL, 0); - fprintf(stderr, "rbd-fuse: %s set to 0x%"PRIx64"\n", + fprintf(stderr, "rbd-fuse: %s set to 0x%" PRIx64 "\n", ap->attrname, *ap->attrvalp); return 0; } @@ -624,7 +625,7 @@ rbdfs_getxattr(const char *path, const char *name, char *value, for (ap = attrs; ap->attrname != NULL; ap++) { if (strcmp(name, ap->attrname) == 0) { - sprintf(buf, "%"PRIu64, *ap->attrvalp); + sprintf(buf, "%" PRIu64, *ap->attrvalp); if (value != NULL && size >= strlen(buf)) strcpy(value, buf); fprintf(stderr, "rbd-fuse: get %s\n", ap->attrname); diff --git a/src/test/test_cors.cc b/src/test/test_cors.cc index 4d385bc037e9..03982c57fdf0 100644 --- a/src/test/test_cors.cc +++ b/src/test/test_cors.cc @@ -11,7 +11,7 @@ extern "C"{ #define S3_BUCKET_NAME "s3testgw.fcgi" #define SWIFT_BUCKET_NAME "swift3testgw.fcgi" #define BUCKET_URL \ - ((g_test->get_key_type() == KEY_TYPE_S3)?(string("/"S3_BUCKET_NAME)):(string("/swift/v1/"SWIFT_BUCKET_NAME))) + ((g_test->get_key_type() == KEY_TYPE_S3)?(string("/" S3_BUCKET_NAME)):(string("/swift/v1/" SWIFT_BUCKET_NAME))) #define GTEST #ifdef GTEST #include @@ -285,13 +285,13 @@ Finisher *finisher; static int create_bucket(void){ if(g_test->get_key_type() == KEY_TYPE_S3){ - g_test->send_request(string("PUT"), string("/"S3_BUCKET_NAME)); + g_test->send_request(string("PUT"), string("/" S3_BUCKET_NAME)); if(g_test->get_resp_code() != 200U){ cout << "Error creating bucket, http code " << g_test->get_resp_code(); return -1; } }else if(g_test->get_key_type() == KEY_TYPE_SWIFT){ - g_test->send_request(string("PUT"), string("/swift/v1/"SWIFT_BUCKET_NAME)); + g_test->send_request(string("PUT"), string("/swift/v1/" SWIFT_BUCKET_NAME)); if(g_test->get_resp_code() != 201U){ cout << "Error creating bucket, http code " << g_test->get_resp_code(); return -1; @@ -302,13 +302,13 @@ static int create_bucket(void){ static int delete_bucket(void){ if(g_test->get_key_type() == KEY_TYPE_S3){ - g_test->send_request(string("DELETE"), string("/"S3_BUCKET_NAME)); + g_test->send_request(string("DELETE"), string("/" S3_BUCKET_NAME)); if(g_test->get_resp_code() != 204U){ cout << "Error deleting bucket, http code " << g_test->get_resp_code(); return -1; } }else if(g_test->get_key_type() == KEY_TYPE_SWIFT){ - g_test->send_request(string("DELETE"), string("/swift/v1/"SWIFT_BUCKET_NAME)); + g_test->send_request(string("DELETE"), string("/swift/v1/" SWIFT_BUCKET_NAME)); if(g_test->get_resp_code() != 204U){ cout << "Error deleting bucket, http code " << g_test->get_resp_code(); return -1; @@ -357,7 +357,7 @@ void send_cors(set o, set h, s3 = static_cast(&config); s3->to_xml(ss); - g_test->send_request(string("PUT"), string("/"S3_BUCKET_NAME"?cors"), cors_read_xml, + g_test->send_request(string("PUT"), string("/" S3_BUCKET_NAME "?cors"), cors_read_xml, (void *)&ss, ss.str().length()); }else if(g_test->get_key_type() == KEY_TYPE_SWIFT){ set::iterator it; @@ -392,7 +392,7 @@ void send_cors(set o, set h, //const char *data = "1"; stringstream ss; ss << "1"; - g_test->send_request(string("POST"), string("/swift/v1/"SWIFT_BUCKET_NAME), cors_read_xml, + g_test->send_request(string("POST"), string("/swift/v1/" SWIFT_BUCKET_NAME), cors_read_xml, (void *)&ss, 1); } } @@ -400,7 +400,7 @@ void send_cors(set o, set h, TEST(TestCORS, getcors_firsttime){ if(g_test->get_key_type() == KEY_TYPE_SWIFT)return; ASSERT_EQ(0, create_bucket()); - g_test->send_request(string("GET"), string("/"S3_BUCKET_NAME"?cors")); + g_test->send_request(string("GET"), string("/" S3_BUCKET_NAME "?cors")); EXPECT_EQ(404U, g_test->get_resp_code()); ASSERT_EQ(0, delete_bucket()); } @@ -418,7 +418,7 @@ TEST(TestCORS, putcors_firsttime){ /*Now get the CORS and check if its fine*/ if(g_test->get_key_type() == KEY_TYPE_S3){ - g_test->send_request(string("GET"), string("/"S3_BUCKET_NAME"?cors")); + g_test->send_request(string("GET"), string("/" S3_BUCKET_NAME "?cors")); EXPECT_EQ(200U, g_test->get_resp_code()); RGWCORSRule *r = xml_to_cors_rule(string("example.com")); @@ -854,7 +854,7 @@ TEST(TestCORS, optionscors_test_options_7){ TEST(TestCORS, deletecors_firsttime){ if(g_test->get_key_type() == KEY_TYPE_SWIFT)return; ASSERT_EQ(0, create_bucket()); - g_test->send_request("DELETE", "/"S3_BUCKET_NAME"?cors"); + g_test->send_request("DELETE", "/" S3_BUCKET_NAME "?cors"); EXPECT_EQ(204U, g_test->get_resp_code()); ASSERT_EQ(0, delete_bucket()); } @@ -870,11 +870,11 @@ TEST(TestCORS, deletecors_test){ send_cors(origins, h, e, flags, CORS_MAX_AGE_INVALID); EXPECT_EQ(((g_test->get_key_type() == KEY_TYPE_SWIFT)?202U:200U), g_test->get_resp_code()); - g_test->send_request("GET", "/"S3_BUCKET_NAME"?cors"); + g_test->send_request("GET", "/" S3_BUCKET_NAME "?cors"); EXPECT_EQ(200U, g_test->get_resp_code()); - g_test->send_request("DELETE", "/"S3_BUCKET_NAME"?cors"); + g_test->send_request("DELETE", "/" S3_BUCKET_NAME "?cors"); EXPECT_EQ(204U, g_test->get_resp_code()); - g_test->send_request("GET", "/"S3_BUCKET_NAME"?cors"); + g_test->send_request("GET", "/" S3_BUCKET_NAME "?cors"); EXPECT_EQ(404U, g_test->get_resp_code()); ASSERT_EQ(0, delete_bucket()); } diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc index 7ffea978d78b..46b69eb6f2d6 100644 --- a/src/test/test_rgw_admin_log.cc +++ b/src/test/test_rgw_admin_log.cc @@ -466,7 +466,7 @@ int caps_rm(const char * name, const char *perm) { } static int create_bucket(void){ - g_test->send_request(string("PUT"), string("/"TEST_BUCKET_NAME)); + g_test->send_request(string("PUT"), string("/" TEST_BUCKET_NAME)); if(g_test->get_resp_code() != 200U){ cout << "Error creating bucket, http code " << g_test->get_resp_code(); return -1; @@ -475,7 +475,7 @@ static int create_bucket(void){ } static int delete_bucket(void){ - g_test->send_request(string("DELETE"), string("/"TEST_BUCKET_NAME)); + g_test->send_request(string("DELETE"), string("/" TEST_BUCKET_NAME)); if(g_test->get_resp_code() != 204U){ cout << "Error deleting bucket, http code " << g_test->get_resp_code(); return -1; @@ -495,7 +495,7 @@ size_t read_bucket_object(void *ptr, size_t s, size_t n, void *ud) { } static int put_bucket_obj(const char *obj_name, char *data, unsigned len) { - string req = "/"TEST_BUCKET_NAME"/"; + string req = "/" TEST_BUCKET_NAME"/"; req.append(obj_name); g_test->send_request(string("PUT"), req, read_bucket_object, (void *)data, (size_t)len); @@ -507,7 +507,7 @@ static int put_bucket_obj(const char *obj_name, char *data, unsigned len) { } static int read_bucket_obj(const char *obj_name) { - string req = "/"TEST_BUCKET_NAME"/"; + string req = "/" TEST_BUCKET_NAME"/"; req.append(obj_name); g_test->send_request(string("GET"), req); if (g_test->get_resp_code() != 200U) { @@ -518,7 +518,7 @@ static int read_bucket_obj(const char *obj_name) { } static int delete_obj(const char *obj_name) { - string req = "/"TEST_BUCKET_NAME"/"; + string req = "/" TEST_BUCKET_NAME"/"; req.append(obj_name); g_test->send_request(string("DELETE"), req); if (g_test->get_resp_code() != 204U) { @@ -1403,7 +1403,7 @@ TEST(TestRGWAdmin, bilog_list) { EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0); free(bucket_obj); - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; g_test->send_request(string("GET"), rest_req); EXPECT_EQ(200U, g_test->get_resp_code()); list entries; @@ -1433,7 +1433,7 @@ TEST(TestRGWAdmin, bilog_list) { EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT_1, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0); free(bucket_obj); - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; g_test->send_request(string("GET"), rest_req); EXPECT_EQ(200U, g_test->get_resp_code()); entries.clear(); @@ -1455,7 +1455,7 @@ TEST(TestRGWAdmin, bilog_list) { } ASSERT_EQ(0, delete_obj(TEST_BUCKET_OBJECT)); - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; g_test->send_request(string("GET"), rest_req); EXPECT_EQ(200U, g_test->get_resp_code()); entries.clear(); @@ -1479,7 +1479,7 @@ TEST(TestRGWAdmin, bilog_list) { EXPECT_EQ(it->index_ver, 6U); } - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; rest_req.append("&marker="); rest_req.append(marker); g_test->send_request(string("GET"), rest_req); @@ -1495,7 +1495,7 @@ TEST(TestRGWAdmin, bilog_list) { EXPECT_EQ(it->op.compare("del"), 0); } - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; rest_req.append("&marker="); rest_req.append(marker); rest_req.append("&max-entries=1"); @@ -1509,14 +1509,14 @@ TEST(TestRGWAdmin, bilog_list) { ASSERT_EQ(0, caps_rm(cname, perm)); perm = "read"; ASSERT_EQ(0, caps_add(cname, perm)); - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; g_test->send_request(string("GET"), rest_req); EXPECT_EQ(200U, g_test->get_resp_code()); ASSERT_EQ(0, caps_rm(cname, perm)); perm = "write"; ASSERT_EQ(0, caps_add(cname, perm)); - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; g_test->send_request(string("GET"), rest_req); EXPECT_EQ(403U, g_test->get_resp_code()); @@ -1535,7 +1535,7 @@ TEST(TestRGWAdmin, bilog_trim) { ASSERT_EQ(0, create_bucket()); - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; g_test->send_request(string("DELETE"), rest_req); EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/ @@ -1544,7 +1544,7 @@ TEST(TestRGWAdmin, bilog_trim) { EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0); free(bucket_obj); - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; g_test->send_request(string("GET"), rest_req); EXPECT_EQ(200U, g_test->get_resp_code()); list entries; @@ -1556,7 +1556,7 @@ TEST(TestRGWAdmin, bilog_trim) { ++it; end_marker = it->op_id; - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; rest_req.append("&start-marker="); rest_req.append(start_marker); rest_req.append("&end-marker="); @@ -1564,7 +1564,7 @@ TEST(TestRGWAdmin, bilog_trim) { g_test->send_request(string("DELETE"), rest_req); EXPECT_EQ(200U, g_test->get_resp_code()); - rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME; + rest_req = "/admin/log?type=bucket-index&bucket=" TEST_BUCKET_NAME; g_test->send_request(string("GET"), rest_req); EXPECT_EQ(200U, g_test->get_resp_code()); entries.clear(); diff --git a/src/test/test_rgw_admin_meta.cc b/src/test/test_rgw_admin_meta.cc index 74bc8ed1ec86..ef76f2ff9be9 100644 --- a/src/test/test_rgw_admin_meta.cc +++ b/src/test/test_rgw_admin_meta.cc @@ -796,7 +796,7 @@ TEST(TestRGWAdmin, meta_lock_unlock) { ASSERT_EQ(0, user_create(uid, display_name)); ASSERT_EQ(0, meta_caps_add(perm)); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/ @@ -804,7 +804,7 @@ TEST(TestRGWAdmin, meta_lock_unlock) { g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/ - rest_req = "/admin/metadata/user?key="CEPH_UID"&unlock"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&unlock"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/ @@ -812,72 +812,72 @@ TEST(TestRGWAdmin, meta_lock_unlock) { g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/ - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&unlock&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&unlock&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph1"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph1"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&unlock&lock_id=ceph1"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&unlock&lock_id=ceph1"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); utime_t sleep_time(3, 0); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph1"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph1"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(500U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(409U, g_test->get_resp_code()); sleep_time.sleep(); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph1"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph1"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&unlock&lock_id=ceph1"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&unlock&lock_id=ceph1"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); ASSERT_EQ(0, meta_caps_rm(perm)); perm = "read"; ASSERT_EQ(0, meta_caps_add(perm)); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(403U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&unlock&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&unlock&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(403U, g_test->get_resp_code()); ASSERT_EQ(0, meta_caps_rm(perm)); perm = "write"; ASSERT_EQ(0, meta_caps_add(perm)); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&unlock&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&unlock&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(200U, g_test->get_resp_code()); ASSERT_EQ(0, meta_caps_rm(perm)); - rest_req = "/admin/metadata/user?key="CEPH_UID"&lock&length=3&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&lock&length=3&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(403U, g_test->get_resp_code()); - rest_req = "/admin/metadata/user?key="CEPH_UID"&unlock&lock_id=ceph"; + rest_req = "/admin/metadata/user?key=" CEPH_UID "&unlock&lock_id=ceph"; g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int)); EXPECT_EQ(403U, g_test->get_resp_code());