From 7e4e74329d1381b20fdfc6550fc55b2523b49a70 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 3 May 2017 14:53:33 -0700 Subject: [PATCH] rgw: use RGW_AMZ_META_PREFIX instead of defining X_AMZ_META_PREFIX Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_rest_s3.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index a948cf1548f60..5cc5a43a475cc 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -2748,14 +2748,13 @@ int RGWConfigBucketMetaSearch_ObjStore_S3::get_params() val = boost::algorithm::to_lower_copy(rgw_trim_whitespace(args[1])); } -#define X_AMZ_META_PREFIX "x-amz-meta-" - if (!boost::algorithm::starts_with(key, X_AMZ_META_PREFIX)) { - s->err.message = string("invalid expression, key must start with '" X_AMZ_META_PREFIX "' : ") + expression; + if (!boost::algorithm::starts_with(key, RGW_AMZ_META_PREFIX)) { + s->err.message = string("invalid expression, key must start with '" RGW_AMZ_META_PREFIX "' : ") + expression; ldout(s->cct, 20) << s->err.message << dendl; return -EINVAL; } - key = key.substr(sizeof(X_AMZ_META_PREFIX) - 1); + key = key.substr(sizeof(RGW_AMZ_META_PREFIX) - 1); ESEntityTypeMap::EntityType entity_type; -- 2.39.5