From 50d667e57bdcd1fa3b412efe8bcebbefed3dbcbe Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Fri, 2 Sep 2011 15:58:49 -0700
Subject: [PATCH] rgw: some var names cleanup

---
 src/rgw/rgw_common.h   |  2 +-
 src/rgw/rgw_op.cc      |  2 +-
 src/rgw/rgw_rest.cc    | 30 +++++++++++++++---------------
 src/rgw/rgw_rest_s3.cc |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 23f6460c9f4f7..4f309bc3e1d7b 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -482,7 +482,7 @@ struct req_state {
    string bucket_name_str;
    string object_str;
 
-   map<string, string> x_amz_map;
+   map<string, string> x_meta_map;
 
    RGWUserInfo user; 
    RGWAccessControlPolicy *acl;
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 302bb4769544f..2fe571d56ed1a 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -114,7 +114,7 @@ static void format_xattr(std::string &xattr)
 void get_request_metadata(struct req_state *s, map<string, bufferlist>& attrs)
 {
   map<string, string>::iterator iter;
-  for (iter = s->x_amz_map.begin(); iter != s->x_amz_map.end(); ++iter) {
+  for (iter = s->x_meta_map.begin(); iter != s->x_meta_map.end(); ++iter) {
     const string &name(iter->first);
     string &xattr(iter->second);
 #define X_AMZ_META "x-amz-meta"
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index ded3346a8d47d..b8e9b7a9277ee 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -546,44 +546,44 @@ static void init_auth_info(struct req_state *s)
 {
   const char *p;
 
-  s->x_amz_map.clear();
+  s->x_meta_map.clear();
 
   for (int i=0; (p = s->fcgx->envp[i]); ++i) {
 #define HTTP_X_AMZ "HTTP_X_AMZ"
     if (strncmp(p, HTTP_X_AMZ, sizeof(HTTP_X_AMZ) - 1) == 0) {
-      RGW_LOG(10) << "amz>> " << p << dendl;
-      const char *amz = p+5; /* skip the HTTP_ part */
-      const char *eq = strchr(amz, '=');
+      RGW_LOG(10) << "meta>> " << p << dendl;
+      const char *name = p+5; /* skip the HTTP_ part */
+      const char *eq = strchr(name, '=');
       if (!eq) /* shouldn't happen! */
         continue;
-      int len = eq - amz;
-      char amz_low[len + 1];
+      int len = eq - name;
+      char name_low[len + 1];
       int j;
       for (j=0; j<len; j++) {
-        amz_low[j] = tolower(amz[j]);
-        if (amz_low[j] == '_')
-          amz_low[j] = '-';
+        name_low[j] = tolower(name[j]);
+        if (name_low[j] == '_')
+          name_low[j] = '-';
       }
-      amz_low[j] = 0;
+      name_low[j] = 0;
       string val;
       line_unfold(eq + 1, val);
 
       map<string, string>::iterator iter;
-      iter = s->x_amz_map.find(amz_low);
-      if (iter != s->x_amz_map.end()) {
+      iter = s->x_meta_map.find(name_low);
+      if (iter != s->x_meta_map.end()) {
         string old = iter->second;
         int pos = old.find_last_not_of(" \t"); /* get rid of any whitespaces after the value */
         old = old.substr(0, pos + 1);
         old.append(",");
         old.append(val);
-        s->x_amz_map[amz_low] = old;
+        s->x_meta_map[name_low] = old;
       } else {
-        s->x_amz_map[amz_low] = val;
+        s->x_meta_map[name_low] = val;
       }
     }
   }
   map<string, string>::iterator iter;
-  for (iter = s->x_amz_map.begin(); iter != s->x_amz_map.end(); ++iter) {
+  for (iter = s->x_meta_map.begin(); iter != s->x_meta_map.end(); ++iter) {
     RGW_LOG(10) << "x>> " << iter->first << ":" << iter->second << dendl;
   }
 
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index e74e7b3ccee20..4aa379ce4e9cb 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -489,7 +489,7 @@ static void get_canon_amz_hdr(struct req_state *s, string& dest)
 {
   dest = "";
   map<string, string>::iterator iter;
-  for (iter = s->x_amz_map.begin(); iter != s->x_amz_map.end(); ++iter) {
+  for (iter = s->x_meta_map.begin(); iter != s->x_meta_map.end(); ++iter) {
     dest.append(iter->first);
     dest.append(":");
     dest.append(iter->second);
-- 
2.39.5