Fix merge issues.

project-chip · Mar 4, 2022 · ff3116f · ff3116f
1 parent 936303f
commit ff3116f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/app/clusters/ota-requestor/OTARequestor.h b/src/app/clusters/ota-requestor/OTARequestor.h
@@ -306,7 +306,6 @@ class OTARequestor : public OTARequestorInterface, public BDXDownloader::StateDe
     char mFileDesignatorBuffer[bdx::kMaxFileDesignatorLen];
     CharSpan mFileDesignator;
     OTAUpdateStateEnum mCurrentUpdateState = OTAUpdateStateEnum::kUnknown;
-    System::Clock::Timeout mTimeoutSec     = chip::System::Clock::Seconds32(5*60); // Abort the QueryImage download request if there's been no progress for 5 minutes
     Server * mServer                       = nullptr;
     chip::Optional<bool> mRequestorCanConsent;
     ProviderLocationList mDefaultOtaProviderList;

diff --git a/src/protocols/bdx/BdxTransferSession.h b/src/protocols/bdx/BdxTransferSession.h
@@ -297,7 +297,7 @@ class DLL_EXPORT TransferSession
     uint64_t GetStartOffset() const { return mStartOffset; }
     uint64_t GetTransferLength() const { return mTransferLength; }
     uint16_t GetTransferBlockSize() const { return mTransferMaxBlockSize; }
-    uint32_t GetNextBlockNum() { return mNextBlockNum; };
+    uint32_t GetNextBlockNum() { return mNextBlockNum; }
     size_t GetNumBytesProcessed() const { return mNumBytesProcessed; }
     const uint8_t * GetFileDesignator(uint16_t & fileDesignatorLen) const
     {