From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 18 Dec 2015 18:07:27 +0000 (-0800)
Subject: rgw: move status_num initialization into constructor
X-Git-Tag: v0.94.8~30^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c79b481311b3cd992794abc6e2f194f350d43531;p=ceph.git

rgw: move status_num initialization into constructor

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 2a12ffc3d7f98504ece8906a6fcb5dac8fd81aba)
---

diff --git a/src/rgw/rgw_civetweb.cc b/src/rgw/rgw_civetweb.cc
index 2ae3b799166..7516c764cab 100644
--- a/src/rgw/rgw_civetweb.cc
+++ b/src/rgw/rgw_civetweb.cc
@@ -27,7 +27,8 @@ int RGWMongoose::write_data(const char *buf, int len)
   return r;
 }
 
-RGWMongoose::RGWMongoose(mg_connection *_conn, int _port) : conn(_conn), port(_port), header_done(false), sent_header(false), has_content_length(false),
+RGWMongoose::RGWMongoose(mg_connection *_conn, int _port) : conn(_conn), port(_port), status_num(0), header_done(false),
+                                                 sent_header(false), has_content_length(false),
                                                  explicit_keepalive(false), explicit_conn_close(false)
 {
 }
@@ -82,7 +83,6 @@ void RGWMongoose::init_env(CephContext *cct)
 {
   env.init(cct);
   struct mg_request_info *info = mg_get_request_info(conn);
-  status_num = 0;
 
   if (!info)
     return;
diff --git a/src/rgw/rgw_fcgi.cc b/src/rgw/rgw_fcgi.cc
index b526dddf30d..1fa2c73bbf5 100644
--- a/src/rgw/rgw_fcgi.cc
+++ b/src/rgw/rgw_fcgi.cc
@@ -29,7 +29,6 @@ void RGWFCGX::flush()
 void RGWFCGX::init_env(CephContext *cct)
 {
   env.init(cct, (char **)fcgx->envp);
-  status_num = 0;
 }
 
 int RGWFCGX::send_status(const char *status, const char *status_name)
diff --git a/src/rgw/rgw_fcgi.h b/src/rgw/rgw_fcgi.h
index a798425ec11..4f8f8ee9541 100644
--- a/src/rgw/rgw_fcgi.h
+++ b/src/rgw/rgw_fcgi.h
@@ -27,7 +27,7 @@ protected:
   int complete_request() { return 0; }
   int send_content_length(uint64_t len);
 public:
-  RGWFCGX(FCGX_Request *_fcgx) : fcgx(_fcgx) {}
+  RGWFCGX(FCGX_Request *_fcgx) : fcgx(_fcgx), status_num(0) {}
   void flush();
 };