use DebugLog for v900

GPSBabel · Nov 2, 2024 · 3638506 · 3638506
1 parent 919b02f
commit 3638506
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/v900.cc b/v900.cc
@@ -75,7 +75,7 @@ for a little more info, see structures:
 
 #include <cassert>     // for assert
 #include <cstdarg>     // for va_end, va_start
-#include <cstdio>      // for fclose, fgets, fread, vfprintf, stderr, va_list
+#include <cstdio>      // for fclose, fgets, fread, va_list
 #include <cstdlib>     // for strtod
 #include <cstring>     // for strncmp, strcat, strcpy, strstr
 
@@ -91,15 +91,12 @@ for a little more info, see structures:
 void
 V900Format::v900_log(const char* fmt, ...)
 {
-  va_list ap;
-
-  if (global_opts.debug_level < 1) {
-    return;
+  if (global_opts.debug_level >= 1) {
+    va_list ap;
+    va_start(ap, fmt);
+    db.vlog(fmt, ap);
+    va_end(ap);
   }
-
-  va_start(ap, fmt);
-  vfprintf(stderr, fmt, ap);
-  va_end(ap);
 }
 
 void

diff --git a/v900.h b/v900.h
@@ -124,11 +124,12 @@ class V900Format : public Format
 
   /* Member Functions */
 
-  [[gnu::format(printf, 1, 2)]] static void v900_log(const char* fmt, ...);
+  [[gnu::format(printf, 2, 3)]] void v900_log(const char* fmt, ...);
   static QDateTime bintime2utc(int date, int time);
 
   /* Data Members */
 
+  DebugLog db;
   FILE* fin = nullptr;
 };