Merge branch 'v0.24.x'

Author: MaxKellermann

src/decoder/DecoderBuffer.cxx

@@ -12,7 +12,7 @@ DecoderBuffer::GetOffset() const noexcept
 }
 
 bool
-DecoderBuffer::Fill()
+DecoderBuffer::Fill() noexcept
 {
 	auto w = buffer.Write();
 	if (w.empty())
@@ -30,7 +30,7 @@ DecoderBuffer::Fill()
 }
 
 std::span<const std::byte>
-DecoderBuffer::Need(size_t min_size)
+DecoderBuffer::Need(size_t min_size) noexcept
 {
 	while (true) {
 		const auto r = Read();
@@ -43,7 +43,7 @@ DecoderBuffer::Need(size_t min_size)
 }
 
 bool
-DecoderBuffer::Skip(size_t nbytes)
+DecoderBuffer::Skip(size_t nbytes) noexcept
 {
 	const auto r = buffer.Read();
 	if (r.size() >= nbytes) {

src/decoder/DecoderBuffer.hxx

@@ -54,7 +54,7 @@ public:
 	 * data available (yet), end of file, I/O error or a decoder
 	 * command was received
 	 */
-	bool Fill();
+	bool Fill() noexcept;
 
 	/**
 	 * How many bytes are stored in the buffer?
@@ -77,7 +77,8 @@ public:
 	 * Wait until this number of bytes are available.  Returns nullptr on
 	 * error.
 	 */
-	std::span<const std::byte> Need(size_t min_size);
+	[[nodiscard]]
+	std::span<const std::byte> Need(size_t min_size) noexcept;
 
 	/**
 	 * Consume (delete, invalidate) a part of the buffer.  The
@@ -96,5 +97,6 @@ public:
 	 * @param nbytes the number of bytes to skip
 	 * @return true on success, false on error
 	 */
-	bool Skip(size_t nbytes);
+	[[nodiscard]]
+	bool Skip(size_t nbytes) noexcept;
 };

test/run_decoder.cxx

@@ -72,7 +72,7 @@ ParseCommandLine(int argc, char **argv)
 
 	auto args = option_parser.GetRemaining();
 	if (args.size() != 2)
-		throw std::runtime_error("Usage: run_decoder [--verbose] [--config=FILE] [--seek=POS] ECODER URI");
+		throw std::runtime_error("Usage: run_decoder [--verbose] [--config=FILE] [--seek=POS] DECODER URI");
 
 	c.decoder = args[0];
 	c.uri = args[1];

test/time/TestFileTime.cxx

@@ -19,9 +19,9 @@ TEST(Time, FileTimeToChrono)
 	struct stat st;
 	ASSERT_EQ(stat(".", &st), 0);
 
-	ASSERT_EQ(std::chrono::system_clock::to_time_t(tp), st.st_mtime);
+	EXPECT_NEAR(std::chrono::system_clock::to_time_t(tp), st.st_mtime, 1);
 
 	const auto ft2 = ChronoToFileTime(std::chrono::system_clock::from_time_t(st.st_mtime));
 	const auto tp2 = FileTimeToChrono(ft2);
-	ASSERT_EQ(std::chrono::system_clock::to_time_t(tp2), st.st_mtime);
+	EXPECT_NEAR(std::chrono::system_clock::to_time_t(tp2), st.st_mtime, 1);
 }