[darwinbuild-changes] [747] trunk/darwinup

[source_changes at macosforge.org]

Revision: 747
          http://trac.macosforge.org/projects/darwinbuild/changeset/747
Author:   wsiegrist at apple.com
Date:     2010-03-08 16:14:18 -0800 (Mon, 08 Mar 2010)
Log Message:
-----------
Roll out r741 from trunk

Revision Links:
--------------
    http://trac.macosforge.org/projects/darwinbuild/changeset/741

Modified Paths:
--------------
    trunk/darwinup/Database.cpp
    trunk/darwinup/Utils.h

Modified: trunk/darwinup/Database.cpp
===================================================================
--- trunk/darwinup/Database.cpp	2010-03-09 00:14:05 UTC (rev 746)
+++ trunk/darwinup/Database.cpp	2010-03-09 00:14:18 UTC (rev 747)
@@ -36,7 +36,7 @@
  * sqlite3_trace callback for debugging
  */
 void dbtrace(void* context, const char* sql) {
-	fprintf(stderr, "SQL: %s\n", sql);
+	IF_DEBUG("[TRACE] %s \n", sql);
 }
 
 Database::Database() {
@@ -107,13 +107,8 @@
 		fprintf(stderr, "Error: unable to connect to database at: %s \n", 
 				m_path);
 		return res;
-	}
-
-	extern uint32_t verbosity;
-	if (verbosity & VERBOSE_SQL) {
-		sqlite3_trace(m_db, dbtrace, NULL);
-	}
-	
+	}	
+	sqlite3_trace(m_db, dbtrace, NULL);
 	if (this->is_empty()) {
 		assert(this->create_tables() == 0);
 	}

Modified: trunk/darwinup/Utils.h
===================================================================
--- trunk/darwinup/Utils.h	2010-03-09 00:14:05 UTC (rev 746)
+++ trunk/darwinup/Utils.h	2010-03-09 00:14:18 UTC (rev 747)
@@ -40,12 +40,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-const uint32_t VERBOSE		    = 0x1;
+const uint32_t VERBOSE		= 0x1;
 const uint32_t VERBOSE_DEBUG	= 0x2;
-const uint32_t VERBOSE_SQL      = 0x4;
 
 #define IF_DEBUG(...) do { extern uint32_t verbosity; if (verbosity & VERBOSE_DEBUG) fprintf(stderr, "DEBUG: " __VA_ARGS__); } while (0)
-#define IF_SQL(...) do { extern uint32_t verbosity; if (verbosity & VERBOSE_SQL) fprintf(stderr, "SQL: " __VA_ARGS__); } while (0)
 
 int fts_compare(const FTSENT **a, const FTSENT **b);
 int ftsent_filename(FTSENT* ent, char* filename, size_t bufsiz);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20100308/2046c89b/attachment-0001.html>