need_comma

Narazaka · Mar 21, 2024 · 236030b · 236030b
1 parent 371dc2b
commit 236030b
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/pngparam.cpp b/pngparam.cpp
@@ -145,16 +145,16 @@ int main(int argc, char *argv[])
             return 1;
         }
         if (json_output) printf("[\n");
-        bool first = true;
+        bool need_comma = false;
         for (int i = 2 + optional_offset; i < argc; i++)
         {
             std::filesystem::directory_iterator root(argv[i]);
             for (const auto &entry : root)
             {
                 if (entry.path().extension() == ".png")
                 {
-                    print_png_parameters(reinterpret_cast<const char *>(entry.path().u8string().c_str()), json_output && !first);
-                    first = false;
+                    print_png_parameters(reinterpret_cast<const char *>(entry.path().u8string().c_str()), need_comma);
+                    need_comma = json_output;
                 }
             }
         }
@@ -168,16 +168,16 @@ int main(int argc, char *argv[])
             return 1;
         }
         if (json_output) printf("[\n");
-        bool first = true;
+        bool need_comma = false;
         for (int i = 2 + optional_offset; i < argc; i++)
         {
             std::filesystem::recursive_directory_iterator root(argv[i]);
             for (const auto &entry : root)
             {
                 if (entry.path().extension() == ".png")
                 {
-                    print_png_parameters(reinterpret_cast<const char *>(entry.path().u8string().c_str()), json_output && !first);
-                    first = false;
+                    print_png_parameters(reinterpret_cast<const char *>(entry.path().u8string().c_str()), need_comma);
+                    need_comma = json_output;
                 }
             }
         }
@@ -191,11 +191,11 @@ int main(int argc, char *argv[])
             return 1;
         }
         if (json_output) printf("[\n");
-        bool first = true;
+        bool need_comma = false;
         for (int i = 1 + optional_offset; i < argc; i++)
         {
-            print_png_parameters(argv[i], json_output && !first);
-            first = false;
+            print_png_parameters(argv[i], need_comma);
+            need_comma = json_output;
         }
         if (json_output) printf("]\n");
     }