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/entitylist.cc | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'server/src/entitylist.cc')

diff --git a/server/src/entitylist.cc b/server/src/entitylist.cc
index 3ec15a5..23acbf4 100644
--- a/server/src/entitylist.cc
+++ b/server/src/entitylist.cc
@@ -56,7 +56,7 @@ static std::vector<std::string> listdir(std::string path)
 
   DIR* dir = opendir(path.c_str());
   if(!dir) {
-    PRACRO_ERR(entitylist, "Could not open directory: %s\n", path.c_str());
+    ERR(entitylist, "Could not open directory: %s\n", path.c_str());
     return files;
   }
 
@@ -117,10 +117,10 @@ void EntityList::rescan()
     while(i != end()) {
       EntityListItem::iterator j = i->second.begin();
       while(j != i->second.end()) {
-        PRACRO_DEBUG(entitylist, "%s - v%s file: %s\n",
-                     i->first.c_str(),
-                     ((std::string)j->first).c_str(),
-                     j->second.c_str());
+        DEBUG(entitylist, "%s - v%s file: %s\n",
+              i->first.c_str(),
+              ((std::string)j->first).c_str(),
+              j->second.c_str());
         j++;
       }
       i++;
@@ -136,7 +136,7 @@ bool EntityList::removeFile(std::string file)
     EntityListItem::iterator j = i->second.begin();
     while(j != i->second.end()) {
       if(file == j->second) {
-        PRACRO_DEBUG(entitylist, "Removing file: %s\n", file.c_str());
+        DEBUG(entitylist, "Removing file: %s\n", file.c_str());
         i->second.erase(j);
         if(i->second.size() == 0) erase(i);
         return true;
@@ -160,10 +160,10 @@ void EntityList::updateList()
   while(inotify.hasEvents()) {
     INotify::Event event = inotify.getNextEvent();
 
-    PRACRO_DEBUG(entitylist, "Handling event %s on %s, with param %s\n",
-                 event.maskstr().c_str(),
-                 event.name().c_str(),
-                 event.file().c_str());
+    DEBUG(entitylist, "Handling event %s on %s, with param %s\n",
+          event.maskstr().c_str(),
+          event.name().c_str(),
+          event.file().c_str());
 
     if(event.isDir()) {
       if(event.isCreateEvent()) {
@@ -206,10 +206,10 @@ std::string EntityList::getLatestVersion(std::string entity) throw(Exception)
     throw Exception("Entity ("+entityname+") ["+entity+"] does not exist.");
   }
 
-  PRACRO_DEBUG(entitylist, "Search for %s - found %s v%s\n",
-               entity.c_str(),
-               mli.begin()->second.c_str(),
-               ((std::string)mli.begin()->first).c_str());
+  DEBUG(entitylist, "Search for %s - found %s v%s\n",
+        entity.c_str(),
+        mli.begin()->second.c_str(),
+        ((std::string)mli.begin()->first).c_str());
 
   return mli.begin()->second;
 }
-- 
cgit v1.2.3