Merge remote-tracking branch 'gh/next'

Conflicts:
	src/common/crc32c_intel_fast.c

4 files changed, 2 insertions, 6 deletions

diff --git a/src/ceph.in b/src/ceph.in
index e4d4cf10344..075ec80c20b 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -644,7 +644,7 @@ def main():
     if parsed_args.output_file:
         try:
             outf = open(parsed_args.output_file, 'w')
-        except:
+        except Exception as e:
             print >> sys.stderr, \
                 'Can\'t open output file {0}: {1}'.\
                 format(parsed_args.output_file, e)
diff --git a/src/common/ceph_json.cc b/src/common/ceph_json.cc
index 84355575c6c..a48e0636fcf 100644
--- a/src/common/ceph_json.cc
+++ b/src/common/ceph_json.cc
@@ -222,9 +222,7 @@ bool JSONParser::parse(const char *buf_, int len)
     return false;
   }
 
-  string json_string = buf_;
-  // make a substring to len
-  json_string = json_string.substr(0, len);
+  string json_string(buf_, len);
   success = read(json_string, data);
   if (success)
     handle_value(data);
diff --git a/src/common/crc32c_intel_fast.c b/src/common/crc32c_intel_fast.c
index 0532dd261cf..42338a7bcd4 100644
--- a/src/common/crc32c_intel_fast.c
+++ b/src/common/crc32c_intel_fast.c
@@ -1,6 +1,5 @@
 #include "acconfig.h"
 #include "include/int_types.h"
-
 #include "common/crc32c_intel_baseline.h"
 
 extern unsigned int crc32_iscsi_00(unsigned char const *buffer, int len, unsigned int crc);
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 3db7c719a82..1b97f28e2fa 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -2635,7 +2635,6 @@ int RGWRados::copy_obj(void *ctx,
     { /* opening scope so that we can do goto, sorry */
       bufferlist& extra_data_bl = processor.get_extra_data();
       if (extra_data_bl.length()) {
-        extra_data_bl.append((char)0);
         JSONParser jp;
         if (!jp.parse(extra_data_bl.c_str(), extra_data_bl.length())) {
           ldout(cct, 0) << "failed to parse response extra data. len=" << extra_data_bl.length() << " data=" << extra_data_bl.c_str() << dendl;