change API: separate functions creating a blur filter, one for a given item, another...

[inkscape.git] / src / debug / logger.cpp

diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp
index 3acd95ff523e6a78588d3bb1a9293b3a619e38d0..fc83e89df006878579182213364194d9f0f34534 100644 (file)
--- a/src/debug/logger.cpp
+++ b/src/debug/logger.cpp
@@ -25,7 +25,7 @@ bool Logger::_category_mask[Event::N_CATEGORIES];
 
 namespace {
 
-static void write_escaped_value(std::ostream &os, Util::shared_ptr<char> value) {
+static void write_escaped_value(std::ostream &os, Util::ptr_shared<char> value) {
     for ( char const *current=value ; *current ; ++current ) {
         switch (*current) {
         case '&':
@@ -57,7 +57,7 @@ static void write_indent(std::ostream &os, unsigned depth) {
 
 static std::ofstream log_stream;
 static bool empty_tag=false;
-typedef std::vector<Util::shared_ptr<char>, GC::Alloc<Util::shared_ptr<char>, GC::MANUAL> > TagStack;
+typedef std::vector<Util::ptr_shared<char>, GC::Alloc<Util::ptr_shared<char>, GC::MANUAL> > TagStack;
 static TagStack &tag_stack() {
     static TagStack stack;
     return stack;
@@ -93,19 +93,29 @@ static void set_category_mask(bool * const mask, char const *filter) {
     while (*end) {
         while ( *end && *end != ',' ) { end++; }
         if ( start != end ) {
-            if (equal_range("CORE", start, end)) {
-                mask[Event::CORE] = true;
-            } else if (equal_range("XML", start, end)) {
-                mask[Event::XML] = true;
-            } else if (equal_range("SPOBJECT", start, end)) {
-                mask[Event::SPOBJECT] = true;
-            } else if (equal_range("DOCUMENT", start, end)) {
-                mask[Event::DOCUMENT] = true;
-            } else if (equal_range("REFCOUNT", start, end)) {
-                mask[Event::REFCOUNT] = true;
-            } else if (equal_range("EXTENSION", start, end)) {
-                mask[Event::EXTENSION] = true;
-            } else {
+            struct CategoryName {
+                char const *name;
+                Event::Category category;
+            };
+            static const CategoryName category_names[] = {
+                { "CORE", Event::CORE },
+                { "XML", Event::XML },
+                { "SPOBJECT", Event::SPOBJECT },
+                { "DOCUMENT", Event::DOCUMENT },
+                { "REFCOUNT", Event::REFCOUNT },
+                { "EXTENSION", Event::EXTENSION },
+                { "FINALIZERS", Event::FINALIZERS },
+                { "OTHER", Event::OTHER },
+                { NULL, Event::OTHER }
+            };
+            CategoryName const *iter;
+            for ( iter = category_names ; iter->name ; iter++ ) {
+                if (equal_range(iter->name, start, end)) {
+                    mask[iter->category] = true;
+                    break;
+                }
+            }
+            if (!iter->name) {
                 g_warning("Unknown debugging category %*s", end - start, start);
             }
         }
@@ -136,7 +146,7 @@ void Logger::init() {
 }
 
 void Logger::_start(Event const &event) {
-    Util::shared_ptr<char> name=event.name();
+    Util::ptr_shared<char> name=event.name();
 
     if (empty_tag) {
         log_stream << ">\n";
@@ -161,7 +171,7 @@ void Logger::_start(Event const &event) {
 }
 
 void Logger::_skip() {
-    tag_stack().push_back(Util::shared_ptr<char>());
+    tag_stack().push_back(Util::ptr_shared<char>());
 }
 
 void Logger::_finish() {