From fbba835d7efaa4ee1d28bf5c7e2232e53d84af5e Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Mon, 5 Jul 2010 09:01:54 +0000
Subject: Remove PRACRO_ prefix from debug macros.

---
 server/src/macrotool/macrotool.cc             | 4 ++--
 server/src/macrotool/macrotool_dump.cc        | 2 +-
 server/src/macrotool/macrotool_fieldnames.cc  | 2 +-
 server/src/macrotool/macrotool_filehandler.cc | 2 +-
 server/src/macrotool/macrotool_util.cc        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'server/src/macrotool')

diff --git a/server/src/macrotool/macrotool.cc b/server/src/macrotool/macrotool.cc
index 40ca845..c41bc9a 100644
--- a/server/src/macrotool/macrotool.cc
+++ b/server/src/macrotool/macrotool.cc
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
   char *xml_basedir = NULL;
   char *debugstr = NULL;
 
-  pracro_debug_init();
+  debug_init(stderr);
 
   int option_index = 0;
   while(1) {
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
   }
 
   if(debugstr) {
-    pracro_debug_parse(debugstr);
+    debug_parse(debugstr);
   }
 
   // Load config
diff --git a/server/src/macrotool/macrotool_dump.cc b/server/src/macrotool/macrotool_dump.cc
index 7e7d06f..30d0fd5 100644
--- a/server/src/macrotool/macrotool_dump.cc
+++ b/server/src/macrotool/macrotool_dump.cc
@@ -298,7 +298,7 @@ void macrotool_dump(std::vector<std::string> params)
     return;
   }
 
-  PRACRO_DEBUG(fieldnames, "dump: %s\n", params[0].c_str());
+  DEBUG(fieldnames, "dump: %s\n", params[0].c_str());
 
   if(params[0] == "fields") {
     if(params.size() != 1) {
diff --git a/server/src/macrotool/macrotool_fieldnames.cc b/server/src/macrotool/macrotool_fieldnames.cc
index 2a9681a..8d90323 100644
--- a/server/src/macrotool/macrotool_fieldnames.cc
+++ b/server/src/macrotool/macrotool_fieldnames.cc
@@ -165,7 +165,7 @@ void macrotool_fieldnames(std::vector<std::string> params)
     return;
   }
 
-  PRACRO_DEBUG(fieldnames, "fieldnames: %s\n", params[0].c_str());
+  DEBUG(fieldnames, "fieldnames: %s\n", params[0].c_str());
 
   if(params[0] == "list") {
     if(params.size() != 1) {
diff --git a/server/src/macrotool/macrotool_filehandler.cc b/server/src/macrotool/macrotool_filehandler.cc
index c52921a..f9a9b45 100644
--- a/server/src/macrotool/macrotool_filehandler.cc
+++ b/server/src/macrotool/macrotool_filehandler.cc
@@ -194,7 +194,7 @@ void macrotool_filehandler(std::vector<std::string> params)
     return;
   }
 
-  PRACRO_DEBUG(filehandler, "filehandler: %s\n", params[0].c_str());
+  DEBUG(filehandler, "filehandler: %s\n", params[0].c_str());
 
   if(params[0] == "add") {
     if(params.size() != 2) {
diff --git a/server/src/macrotool/macrotool_util.cc b/server/src/macrotool/macrotool_util.cc
index 3c18ab7..075a9e0 100644
--- a/server/src/macrotool/macrotool_util.cc
+++ b/server/src/macrotool/macrotool_util.cc
@@ -40,7 +40,7 @@ static std::vector<std::string> listdir(std::string path)
 
   DIR* dir = opendir(path.c_str());
   if(!dir) {
-    PRACRO_ERR(dump, "Could not open directory: %s\n", path.c_str());
+    ERR(dump, "Could not open directory: %s\n", path.c_str());
     return files;
   }
 
-- 
cgit v1.2.3