From 2adebe69c73db27e39e69dbfb28a8640732e482f Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Mon, 4 Apr 2016 14:56:36 +0200 Subject: [PATCH] rgw: improve const-correctness of rgw_get_user_info_by_swift(). Signed-off-by: Radoslaw Zarzynski --- src/rgw/rgw_user.cc | 21 +++++++++++++++------ src/rgw/rgw_user.h | 7 +++++-- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc index 361a8c8193adb..1f93aa3d789b8 100644 --- a/src/rgw/rgw_user.cc +++ b/src/rgw/rgw_user.cc @@ -215,8 +215,12 @@ struct user_info_entry { static RGWChainedCacheImpl uinfo_cache; -int rgw_get_user_info_from_index(RGWRados *store, string& key, rgw_bucket& bucket, RGWUserInfo& info, - RGWObjVersionTracker *objv_tracker, real_time *pmtime) +int rgw_get_user_info_from_index(RGWRados * const store, + const string& key, + rgw_bucket& bucket, + RGWUserInfo& info, + RGWObjVersionTracker * const objv_tracker, + real_time * const pmtime) { user_info_entry e; if (uinfo_cache.find(key, &e)) { @@ -318,10 +322,15 @@ int rgw_get_user_info_by_email(RGWRados *store, string& email, RGWUserInfo& info * Given an swift username, finds the user_info associated with it. * returns: 0 on success, -ERR# on failure (including nonexistence) */ -extern int rgw_get_user_info_by_swift(RGWRados *store, string& swift_name, RGWUserInfo& info, - RGWObjVersionTracker *objv_tracker, real_time *pmtime) -{ - return rgw_get_user_info_from_index(store, swift_name, store->get_zone_params().user_swift_pool, info, objv_tracker, pmtime); +extern int rgw_get_user_info_by_swift(RGWRados * const store, + const string& swift_name, + RGWUserInfo& info, /* out */ + RGWObjVersionTracker * const objv_tracker, + real_time * const pmtime) +{ + return rgw_get_user_info_from_index(store, swift_name, + store->get_zone_params().user_swift_pool, + info, objv_tracker, pmtime); } /** diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h index 4ede53c677b17..f3d0bce761a9d 100644 --- a/src/rgw/rgw_user.h +++ b/src/rgw/rgw_user.h @@ -92,8 +92,11 @@ extern int rgw_get_user_info_by_email(RGWRados *store, string& email, RGWUserInf * Given an swift username, finds the user info associated with it. * returns: 0 on success, -ERR# on failure (including nonexistence) */ -extern int rgw_get_user_info_by_swift(RGWRados *store, string& swift_name, RGWUserInfo& info, - RGWObjVersionTracker *objv_tracker = NULL, real_time *pmtime = NULL); +extern int rgw_get_user_info_by_swift(RGWRados *store, + const string& swift_name, + RGWUserInfo& info, /* out */ + RGWObjVersionTracker *objv_tracker = nullptr, + real_time *pmtime = nullptr); /** * Given an access key, finds the user info associated with it. * returns: 0 on success, -ERR# on failure (including nonexistence) -- 2.39.5