X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Fapplications%2Fbookmark_tools%2Fbookmark_tree.cpp;h=33ce8b05c2fd93009f643fcbd93b9d7800992cd4;hb=1c1b07ac310120b80ad371ebb586e31d7b12127d;hp=04dd9d5f4b5029fcce2dac0ed3a64bf84956da5f;hpb=51d71c226be424b6a698c7474d237e8c69661af5;p=feisty_meow.git diff --git a/nucleus/applications/bookmark_tools/bookmark_tree.cpp b/nucleus/applications/bookmark_tools/bookmark_tree.cpp index 04dd9d5f..33ce8b05 100644 --- a/nucleus/applications/bookmark_tools/bookmark_tree.cpp +++ b/nucleus/applications/bookmark_tools/bookmark_tree.cpp @@ -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.