refactor: Drop unused CBufferedFile::Seek()

hebasto · hebasto · commit 7b3851e9473e · 2020-07-26T22:46:28.000+03:00
diff --git a/src/streams.h b/src/streams.h
@@ -814,18 +814,6 @@ class CBufferedFile
         return true;
     }
 
-    bool Seek(uint64_t nPos) {
-        long nLongPos = nPos;
-        if (nPos != (uint64_t)nLongPos)
-            return false;
-        if (fseek(src, nLongPos, SEEK_SET))
-            return false;
-        nLongPos = ftell(src);
-        nSrcPos = nLongPos;
-        nReadPos = nLongPos;
-        return true;
-    }
-
     //! prevent reading beyond a certain position
     //! no argument removes the limit
     bool SetLimit(uint64_t nPos = std::numeric_limits<uint64_t>::max()) {
diff --git a/src/test/fuzz/buffered_file.cpp b/src/test/fuzz/buffered_file.cpp
@@ -31,7 +31,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
     if (opt_buffered_file && fuzzed_file != nullptr) {
         bool setpos_fail = false;
         while (fuzzed_data_provider.ConsumeBool()) {
-            switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 5)) {
+            switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 4)) {
             case 0: {
                 std::array<uint8_t, 4096> arr{};
                 try {
@@ -41,20 +41,16 @@ void test_one_input(const std::vector<uint8_t>& buffer)
                 break;
             }
             case 1: {
-                opt_buffered_file->Seek(fuzzed_data_provider.ConsumeIntegralInRange<uint64_t>(0, 4096));
-                break;
-            }
-            case 2: {
                 opt_buffered_file->SetLimit(fuzzed_data_provider.ConsumeIntegralInRange<uint64_t>(0, 4096));
                 break;
             }
-            case 3: {
+            case 2: {
                 if (!opt_buffered_file->SetPos(fuzzed_data_provider.ConsumeIntegralInRange<uint64_t>(0, 4096))) {
                     setpos_fail = true;
                 }
                 break;
             }
-            case 4: {
+            case 3: {
                 if (setpos_fail) {
                     // Calling FindByte(...) after a failed SetPos(...) call may result in an infinite loop.
                     break;
@@ -65,7 +61,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
                 }
                 break;
             }
-            case 5: {
+            case 4: {
                 ReadFromStream(fuzzed_data_provider, *opt_buffered_file);
                 break;
             }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)`
`31`	`31`	`if (opt_buffered_file && fuzzed_file != nullptr) {`
`32`	`32`	`bool setpos_fail = false;`
`33`	`33`	`while (fuzzed_data_provider.ConsumeBool()) {`
`34`		`- switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 5)) {`
	`34`	`+ switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 4)) {`
`35`	`35`	`case 0: {`
`36`	`36`	`std::array<uint8_t, 4096> arr{};`
`37`	`37`	`try {`
`@@ -41,20 +41,16 @@ void test_one_input(const std::vector<uint8_t>& buffer)`
`41`	`41`	`break;`
`42`	`42`	`}`
`43`	`43`	`case 1: {`
`44`		`- opt_buffered_file->Seek(fuzzed_data_provider.ConsumeIntegralInRange<uint64_t>(0, 4096));`
`45`		`- break;`
`46`		`- }`
`47`		`- case 2: {`
`48`	`44`	`opt_buffered_file->SetLimit(fuzzed_data_provider.ConsumeIntegralInRange<uint64_t>(0, 4096));`
`49`	`45`	`break;`
`50`	`46`	`}`
`51`		`- case 3: {`
	`47`	`+ case 2: {`
`52`	`48`	`if (!opt_buffered_file->SetPos(fuzzed_data_provider.ConsumeIntegralInRange<uint64_t>(0, 4096))) {`
`53`	`49`	`setpos_fail = true;`
`54`	`50`	`}`
`55`	`51`	`break;`
`56`	`52`	`}`
`57`		`- case 4: {`
	`53`	`+ case 3: {`
`58`	`54`	`if (setpos_fail) {`
`59`	`55`	`// Calling FindByte(...) after a failed SetPos(...) call may result in an infinite loop.`
`60`	`56`	`break;`
`@@ -65,7 +61,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)`
`65`	`61`	`}`
`66`	`62`	`break;`
`67`	`63`	`}`
`68`		`- case 5: {`
	`64`	`+ case 4: {`
`69`	`65`	`ReadFromStream(fuzzed_data_provider, *opt_buffered_file);`
`70`	`66`	`break;`
`71`	`67`	`}`