Update properties file for inquiry mode

PiSCSI · Nov 1, 2023 · f573406 · f573406
1 parent c65b5cc
commit f573406
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cpp/scsidump/scsidump_core.cpp b/cpp/scsidump/scsidump_core.cpp
@@ -698,9 +698,11 @@ void ScsiDump::inquiry_info::GeneratePropertiesFile(const string& property_file)
     out << "{" << endl
     		<< "   \"vendor\": \"" << vendor << "\"," << endl
 			<< "   \"product\": \"" << product << "\"," << endl
-			<< "   \"revision\": \"" << revision << "\"," << endl
-			<< "   \"block_size\": \"" << sector_size << "\"" << endl
-			<< "}" << endl;
+			<< "   \"revision\": \"" << revision << "\"";
+    if (sector_size) {
+    	out << "," << endl << "   \"block_size\": \"" << sector_size << "\"";
+    }
+    out << endl << "}" << endl;
 
     if (out.fail()) {
         cerr << "Error: Can't create properties file '" + property_file + "'" << endl;

diff --git a/cpp/test/scsidump_test.cpp b/cpp/test/scsidump_test.cpp
@@ -58,8 +58,7 @@ TEST(ScsiDumpTest, GeneratePropertiesFile)
     expected_str = "{\n"
                    "   \"vendor\": \"\",\n"
                    "   \"product\": \"\",\n"
-                   "   \"revision\": \"\",\n"
-                   "   \"block_size\": \"0\"\n"
+                   "   \"revision\": \"\"\n"
                    "}\n";
     EXPECT_EQ(expected_str, ReadTempFileToString(filename));
     remove(filename);