Debug improved

diff --git a/yarrg/rscommon.h b/yarrg/rscommon.h
index 871ee02e7e5cc494b82f71f8f95fac5e13483ee7..6fd394ea008d7eb0829189426633106b6572a5b0 100644 (file)
--- a/yarrg/rscommon.h
+++ b/yarrg/rscommon.h
@@ -3,6 +3,10 @@
 
 #include <sqlite3.h>
 
+#define DEBUG_FLAG_LIST                                \
+   DF(sql)
+
+
 #include "common.h"
 
 extern struct sqlite *db;

diff --git a/yarrg/rsmain.c b/yarrg/rsmain.c
index a60389c3672d67f4d6cd59c3474d40beb1b7ad63..2ed1e0e7dae61cc16aa1a454e1c4f4904e9147e2 100644 (file)
--- a/yarrg/rsmain.c
+++ b/yarrg/rsmain.c
@@ -6,6 +6,9 @@ int o_quiet= 0;
 
 int main(int argc, const char **argv) {
   int ia[argc], ni=0;
+
+  debug_flags= ~0UL;
+  
   const char *arg;
   while ((arg= *++argv)) {
     ia[ni++]= atoi(arg);

diff --git a/yarrg/rsvalue.c b/yarrg/rsvalue.c
index fe9c992acb4220ce9e15b5f7fb7bd1d93c7685f7..f399e3f51abcc00d1538d9173193ccc84712011b 100644 (file)
--- a/yarrg/rsvalue.c
+++ b/yarrg/rsvalue.c
@@ -1,5 +1,9 @@
 /**/
 
+#include "rscommon.h"
+
+DEBUG_DEFINE_SOME_DEBUGF(sql,sql_dprintf);
+
 typedef struct {
   int commodid, src_price, src_qty, dst_price, dst_qty;
 } Trade;
@@ -9,8 +13,6 @@ typedef struct {
   Trade *trades;
 } IslandPair;
 
-#include "rscommon.h"
-
 static void ipair_gettrades(int si, int di) {
   char *stmt= masprintf
     ("SELECT\n"
@@ -27,7 +29,7 @@ static void ipair_gettrades(int si, int di) {
      " GROUP BY sell.commodid, sell.price, buy.price\n",
      si, di);
   
-  printf("SQL\n[\n%s\n]\n", stmt);
+  sql_dprintf("SQL\n[\n%s\n]\n", stmt);
 
   free(stmt);
 }