Merge branch 'release-2.140.92' into dev

[feisty_meow.git] / nucleus / applications / bookmark_tools / bookmark_tree.cpp

diff --git a/nucleus/applications/bookmark_tools/bookmark_tree.cpp b/nucleus/applications/bookmark_tools/bookmark_tree.cpp
index c8fc1f5594ea57809a1462b07a9c05d2250d19bc..33ce8b05c2fd93009f643fcbd93b9d7800992cd4 100644 (file)
--- a/nucleus/applications/bookmark_tools/bookmark_tree.cpp
+++ b/nucleus/applications/bookmark_tools/bookmark_tree.cpp
@@ -135,7 +135,7 @@ inner_mark_tree &bookmark_tree::access_root() { return *_mark_tree; }
 
 bool bookmark_tree::magic_category_comparison(const astring &a, const astring &b)
 {
-//  FUNCDEF("magic_category_comparison");
+  FUNCDEF("magic_category_comparison");
 //LOG(astring("compare: a=") + a + " b=" + b);
   if (a.iequals(b)) return true;
   astring a_name, a_nick;
@@ -279,7 +279,7 @@ inner_mark_tree *bookmark_tree::process_category(const string_array &items)
     }
     LOG(astring("category name \"") + category_name
         + "\" in conflict with existing: " + catnames);
-    inner_mark_tree *fake_it = NIL;
+    inner_mark_tree *fake_it = NULL_POINTER;
 
 //hmmm: neither of these are right; they need to use a comparator that
 //      uses our magic comparison function.
@@ -321,7 +321,7 @@ inner_mark_tree *bookmark_tree::process_category(const string_array &items)
     LOG("==> failure to find a match for either category!");
     deadly_error(class_name(), func, "collision resolution code failed; "
         "please fix category error");
-    return NIL;
+    return NULL_POINTER;
   }
   // now that we know these names are unique, we'll add them into the list
   // so future categories can't reuse these.
@@ -409,7 +409,7 @@ void bookmark_tree::process_link(const string_array &items)
 
 void bookmark_tree::process_comment(const astring &current_line_in)
 {
-///  FUNCDEF("process_comment");
+  FUNCDEF("process_comment");
   astring current_line = current_line_in;
 
   // output the comment as simple text.