From 8fb9ae880bac503d9190081a23e1f1812b1f6445 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Fri, 9 Aug 2024 23:26:22 +0200
Subject: [PATCH] fix: fuzzing code was broken after moving to new namespaces

---
 test/fuzz_categorizers.cpp | 4 ++--
 test/fuzz_mkdwarfs.cpp     | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/fuzz_categorizers.cpp b/test/fuzz_categorizers.cpp
index aa0441b2..e0ac3838 100644
--- a/test/fuzz_categorizers.cpp
+++ b/test/fuzz_categorizers.cpp
@@ -36,8 +36,8 @@ int main(int argc, char** argv) {
 
   null_logger lgr;
 
-  auto& catreg = categorizer_registry::instance();
-  auto catmgr = std::make_shared<categorizer_manager>(lgr);
+  auto& catreg = writer::categorizer_registry::instance();
+  auto catmgr = std::make_shared<writer::categorizer_manager>(lgr);
 
   boost::program_options::variables_map vm;
   catmgr->add(catreg.create(lgr, "pcmaudio", vm));
diff --git a/test/fuzz_mkdwarfs.cpp b/test/fuzz_mkdwarfs.cpp
index c0f1f41c..b31a139a 100644
--- a/test/fuzz_mkdwarfs.cpp
+++ b/test/fuzz_mkdwarfs.cpp
@@ -23,6 +23,7 @@
 
 #include <folly/FileUtil.h>
 
+#include <dwarfs/tool/main_adapter.h>
 #include <dwarfs_tool_main.h>
 
 #include "test_helpers.h"
@@ -54,10 +55,7 @@ int main(int argc, char** argv) {
     auto args = test::parse_args(cmdline);
     args.insert(args.begin(), "mkdwarfs");
 
-    try {
-      mkdwarfs_main(args, iol->get());
-    } catch (const std::exception&) {
-    }
+    tool::main_adapter(tool::mkdwarfs_main).safe(args, iol->get());
   }
 
   return 0;