minor rename

Author: andiwand

src/odr/global_params.cpp

@@ -41,8 +41,8 @@ const std::string &GlobalParams::pdf2htmlex_data_path() {
   return instance().m_pdf2htmlex_data_path;
 }
 
-const std::string &GlobalParams::libmagic_path() {
-  return instance().m_libmagic_path;
+const std::string &GlobalParams::libmagic_database_path() {
+  return instance().m_libmagic_database_path;
 }
 
 void GlobalParams::set_odr_core_data_path(const std::string &path) {
@@ -66,15 +66,16 @@ void GlobalParams::set_pdf2htmlex_data_path(const std::string &path) {
   instance().m_pdf2htmlex_data_path = path;
 }
 
-void GlobalParams::set_libmagic_path(const std::string &path) {
-  instance().m_libmagic_path = path;
+void GlobalParams::set_libmagic_database_path(const std::string &path) {
+  instance().m_libmagic_database_path = path;
 }
 
 GlobalParams::GlobalParams()
     : m_odr_core_data_path{internal::project_info::odr_data_path()},
       m_fontconfig_data_path{internal::project_info::fontconfig_data_path()},
       m_poppler_data_path{internal::project_info::poppler_data_path()},
       m_pdf2htmlex_data_path{internal::project_info::pdf2htmlex_data_path()},
-      m_libmagic_path{internal::project_info::libmagic_path()} {}
+      m_libmagic_database_path{
+          internal::project_info::libmagic_database_path()} {}
 
 } // namespace odr

src/odr/global_params.hpp

@@ -10,13 +10,13 @@ class GlobalParams {
   static const std::string &fontconfig_data_path();
   static const std::string &poppler_data_path();
   static const std::string &pdf2htmlex_data_path();
-  static const std::string &libmagic_path();
+  static const std::string &libmagic_database_path();
 
   static void set_odr_core_data_path(const std::string &path);
   static void set_fontconfig_data_path(const std::string &path);
   static void set_poppler_data_path(const std::string &path);
   static void set_pdf2htmlex_data_path(const std::string &path);
-  static void set_libmagic_path(const std::string &path);
+  static void set_libmagic_database_path(const std::string &path);
 
 private:
   static GlobalParams &instance();
@@ -27,7 +27,7 @@ class GlobalParams {
   std::string m_fontconfig_data_path;
   std::string m_poppler_data_path;
   std::string m_pdf2htmlex_data_path;
-  std::string m_libmagic_path;
+  std::string m_libmagic_database_path;
 };
 
 } // namespace odr

src/odr/internal/libmagic/libmagic.cpp

@@ -29,8 +29,8 @@ magic_t get_magic_cookie() {
   if (!magic_cookie) {
     throw std::runtime_error("magic_open failed");
   }
-  if (magic_load(magic_cookie.get(), GlobalParams::libmagic_path().c_str()) ==
-      0) {
+  if (magic_load(magic_cookie.get(),
+                 GlobalParams::libmagic_database_path().c_str()) == 0) {
     return magic_cookie.get();
   }
   if (magic_load(magic_cookie.get(), nullptr) == 0) {

src/odr/internal/project_info.cpp.in

@@ -52,7 +52,7 @@ const char *project_info::pdf2htmlex_data_path() noexcept{
         return "${PDF2HTMLEX_DATA_DIR}";
 }
 
-const char *project_info::libmagic_path() noexcept{
+const char *project_info::libmagic_database_path() noexcept{
         return "${MAGIC}";
 }
 

src/odr/internal/project_info.hpp

@@ -13,6 +13,6 @@ const char *odr_data_path() noexcept;
 const char *fontconfig_data_path() noexcept;
 const char *poppler_data_path() noexcept;
 const char *pdf2htmlex_data_path() noexcept;
-const char *libmagic_path() noexcept;
+const char *libmagic_database_path() noexcept;
 
 } // namespace odr::internal::project_info