Fix errors & reduce diff

Signed-off-by: Tin Švagelj <tin.svagelj@live.com>
brndnmtthws · May 4, 2024 · 457ce1b · 457ce1b
1 parent 6f43619
commit 457ce1b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,6 +44,7 @@ configure_file(${CMAKE_MODULE_PATH}/build.h.in ${CMAKE_BINARY_DIR}/build.h)
 set(conky_sources ${CMAKE_BINARY_DIR}/config.h ${CMAKE_BINARY_DIR}/build.h)
 
 # Finally, add some code
+add_subdirectory(lua)
 add_subdirectory(data)
 add_subdirectory(doc)
 
@@ -67,8 +68,6 @@ endif()
 
 add_subdirectory(src)
 
-add_subdirectory(lua)
-
 if(BUILD_TESTS)
   add_subdirectory(tests)
   enable_testing()

diff --git a/lua/CMakeLists.txt b/lua/CMakeLists.txt
@@ -72,7 +72,7 @@ if(BUILD_LUA_IMLIB2)
   add_library(conky-imlib2 MODULE ${luaimlib2_src})
   set_target_properties(conky-imlib2 PROPERTIES OUTPUT_NAME "imlib2")
 
-  target_link_libraries(conky-imlib2 ${luaimlib2_libs} toluapp_lib_static )
+  target_link_libraries(conky-imlib2 ${luaimlib2_libs} toluapp_lib_static)
   set(lua_libs ${lua_libs} conky-imlib2)
 
   print_target_properties(conky-imlib2)

diff --git a/src/darwin.mm b/src/darwin.mm
@@ -87,11 +87,8 @@
 #include <time.h>
 #endif
 
-/* debugging defines */
-#undef NDEBUG
-
 /* (E)nhanced printf */
-#ifndef NDEBUG
+#if true // ifdef NDEBUG
 #include <cstdarg>
 void eprintf(const char *fmt, ...) {
   va_list args;

diff --git a/src/logger.hh b/src/logger.hh
@@ -43,6 +43,7 @@
 #include <ctime>
 #include <optional>
 #include <stdexcept>
+#include <string>
 #include <tuple>
 #include <type_traits>
 

diff --git a/src/logging.h b/src/logging.h
@@ -32,6 +32,8 @@
 
 #include "logger.hh"
 
+#include <string>
+
 class fork_throw : public std::runtime_error {
  public:
   fork_throw() : std::runtime_error("Fork happened") {}
@@ -92,9 +94,9 @@ namespace _priv_error_print {
 template <typename... Args>
 inline std::string alloc_printf(const char *format, Args &&...args) {
   auto size = std::snprintf(nullptr, 0, format, args...);
-  std::string output(size + 1, '\0');
-  std::sprintf(&output[0], format, args...);
-  return output;
+  char output[size + 1];
+  std::snprintf(output, sizeof(output), format, args...);
+  return std::string(&output[0]);
 }
 inline std::string alloc_printf(const char *format) {
   return std::string(format);
@@ -103,6 +105,10 @@ inline std::string alloc_printf(const char *format) {
 
 class error : public std::runtime_error {
  public:
+  /// @brief Construct a new error object.
+  ///
+  /// @param Msg Already localized error message.
+  error(const std::string &msg) : std::runtime_error(msg) {}
   error(const char *msg) : std::runtime_error(_(msg)) {}
   template <typename... Args>
   error(const char *format, Args &&...args)