Mac 10.6 SDK compatibility

client/crash_report_database_mac.mm

 // Copyright 2015 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 94 matching lines @@
 
   bool Initialize();
 
   // CrashReportDatabase:
   OperationStatus PrepareNewCrashReport(NewReport** report) override;
   OperationStatus FinishedWritingCrashReport(NewReport* report,
                                              UUID* uuid) override;
   OperationStatus ErrorWritingCrashReport(NewReport* report) override;
   OperationStatus LookUpCrashReport(const UUID& uuid,
                                     Report* report) override;
-  OperationStatus GetPendingReports(
-      std::vector<const Report>* reports) override;
-  OperationStatus GetCompletedReports(
-      std::vector<const Report>* reports) override;
+  OperationStatus GetPendingReports(std::vector<Report>* reports) override;
+  OperationStatus GetCompletedReports(std::vector<Report>* reports) override;
   OperationStatus GetReportForUploading(const UUID& uuid,
                                         const Report** report) override;
   OperationStatus RecordUploadAttempt(const Report* report,
                                       bool successful,
                                       const std::string& id) override;
   OperationStatus SkipReportUpload(const UUID& uuid) override;
 
  private:
   //! \brief A private extension of the Report class that maintains bookkeeping
   //!    information of the database.
@@ skipping 39 matching lines @@
                                        Report* report);
 
   //! \brief Reads the metadata from all the reports in a database subdirectory.
   //!      Invalid reports are skipped.
   //!
   //! \param[in] path The database subdirectory path.
   //! \param[out] reports An empty vector of reports, which will be filled.
   //!
   //! \return The operation status code.
   static OperationStatus ReportsInDirectory(const base::FilePath& path,
-                                            std::vector<const Report>* reports);
+                                            std::vector<Report>* reports);
 
 
   //! \brief Creates a database xattr name from the short constant name.
   //!
   //! \param[in] name The short name of the extended attribute.
   //!
   //! \return The long name of the extended attribute.
   static std::string XattrName(const base::StringPiece& name);
 
   base::FilePath base_dir_;
@@ skipping 123 matching lines @@
   *report = Report();
   report->file_path = path;
   if (!ReadReportMetadataLocked(path, report))
     return kDatabaseError;
 
   return kNoError;
 }
 
 CrashReportDatabase::OperationStatus
 CrashReportDatabaseMac::GetPendingReports(
-    std::vector<const CrashReportDatabase::Report>* reports) {
+    std::vector<CrashReportDatabase::Report>* reports) {
   return ReportsInDirectory(base_dir_.Append(kUploadPendingDirectory), reports);
 }
 
 CrashReportDatabase::OperationStatus
 CrashReportDatabaseMac::GetCompletedReports(
-    std::vector<const CrashReportDatabase::Report>* reports) {
+    std::vector<CrashReportDatabase::Report>* reports) {
   return ReportsInDirectory(base_dir_.Append(kCompletedDirectory), reports);
 }
 
 CrashReportDatabase::OperationStatus
 CrashReportDatabaseMac::GetReportForUploading(const UUID& uuid,
                                               const Report** report) {
   base::FilePath report_path = LocateCrashReport(uuid);
   if (report_path.empty())
     return kReportNotFound;
 
@@ skipping 109 matching lines @@
     }
   }
 
   return base::FilePath();
 }
 
 // static
 base::ScopedFD CrashReportDatabaseMac::ObtainReportLock(
     const base::FilePath& path) {
   int fd = HANDLE_EINTR(open(path.value().c_str(),
-                             O_RDONLY | O_EXLOCK | O_CLOEXEC | O_NONBLOCK));
+                             O_RDONLY | O_EXLOCK | O_NONBLOCK));
   PLOG_IF(ERROR, fd < 0) << "open lock " << path.value();
   return base::ScopedFD(fd);
 }
 
 // static
 bool CrashReportDatabaseMac::ReadReportMetadataLocked(
     const base::FilePath& path, Report* report) {
   std::string uuid_string;
   if (ReadXattr(path, XattrName(kXattrUUID),
                 &uuid_string) != XattrStatus::kOK ||
@@ skipping 30 matching lines @@
                    &report->upload_attempts) == XattrStatus::kOtherError) {
     return false;
   }
 
   return true;
 }
 
 // static
 CrashReportDatabase::OperationStatus CrashReportDatabaseMac::ReportsInDirectory(
     const base::FilePath& path,
-    std::vector<const CrashReportDatabase::Report>* reports) {
+    std::vector<CrashReportDatabase::Report>* reports) {
   DCHECK(reports->empty());
 
   NSError* error = nil;
   NSArray* paths = [[NSFileManager defaultManager]
       contentsOfDirectoryAtPath:base::SysUTF8ToNSString(path.value())
                           error:&error];
   if (error) {
     LOG(ERROR) << "Failed to enumerate reports in directory " << path.value()
                << ": " << [[error description] UTF8String];
     return kFileSystemError;
@@ skipping 30 matching lines @@
     const base::FilePath& path) {
   scoped_ptr<CrashReportDatabaseMac> database_mac(
       new CrashReportDatabaseMac(path.Append(kDatabaseDirectoryName)));
   if (!database_mac->Initialize())
     database_mac.reset();
 
   return scoped_ptr<CrashReportDatabase>(database_mac.release());
 }
 
 }  // namespace crashpad