cleanup: More cleanup of unused debug logging code.

Author: iphydf

lib/src/jvmMain/cpp/CMakeLists.txt

@@ -121,8 +121,6 @@ add_library(
   util/exceptions.cpp
   util/exceptions.h
   util/instance_manager.h
-  util/logging.cpp
-  util/logging.h
   util/pp_attributes.h
   util/pp_cat.h
   util/to_bytes.cpp

lib/src/jvmMain/cpp/ToxAv/av.cpp

@@ -25,13 +25,7 @@ TOX_METHOD (jbyteArray, Iterate,
   return instances.with_instance (env, instanceNumber,
     [=] (ToxAV *av, Events &events) -> jbyteArray
       {
-        InstanceLogEntry log_entry (instanceNumber, toxav_iterate, av);
-
-#if 0
-        log_entry.print_result (toxav_iterate, av, &events);
-#else
-        log_entry.print_result (toxav_iterate, av);
-#endif
+        toxav_iterate(av);
         if (events.ByteSizeLong () == 0)
           return nullptr;
 

lib/src/jvmMain/cpp/ToxCore/connection.cpp

@@ -103,9 +103,7 @@ TOX_METHOD (jbyteArray, Iterate,
   return instances.with_instance (env, instanceNumber,
     [=] (Tox *tox, Events &events) -> jbyteArray
       {
-        InstanceLogEntry log_entry (instanceNumber, tox_iterate, tox);
-
-        log_entry.print_result (tox_iterate, tox, &events);
+        tox_iterate(tox, &events);
         if (events.ByteSizeLong () == 0)
           return nullptr;
 

lib/src/jvmMain/cpp/ToxCrypto/encryptsave.cpp

@@ -49,8 +49,7 @@ JNIEXPORT jbyteArray JNICALL Java_im_tox_tox4j_impl_jni_ToxCryptoJni_toxGetSalt
   auto data = fromJavaArray (env, dataArray);
   uint8_t salt[TOX_PASS_SALT_LENGTH] = { 0 };
 
-  LogEntry log_entry (tox_get_salt);
-  return with_error_handling<ToxCrypto> (log_entry, env,
+  return with_error_handling<ToxCrypto> (env,
     [env, &salt] (bool er)
       {
         return toJavaArray (env, salt);
@@ -93,8 +92,7 @@ JNIEXPORT jbyteArray JNICALL Java_im_tox_tox4j_impl_jni_ToxCryptoJni_toxPassKeyD
       return nullptr;
     }
 
-  LogEntry log_entry (tox_pass_key_derive_with_salt);
-  return with_error_handling<ToxCrypto> (log_entry, env,
+  return with_error_handling<ToxCrypto> (env,
     [env] (Tox_Pass_Key *out_key)
       {
         pass_key_ptr deleter (out_key);
@@ -117,8 +115,7 @@ JNIEXPORT jbyteArray JNICALL Java_im_tox_tox4j_impl_jni_ToxCryptoJni_toxPassKeyD
 {
   auto passphrase = fromJavaArray (env, passphraseArray);
 
-  LogEntry log_entry (tox_pass_key_derive);
-  return with_error_handling<ToxCrypto> (log_entry, env,
+  return with_error_handling<ToxCrypto> (env,
     [env] (Tox_Pass_Key *out_key)
       {
         pass_key_ptr deleter (out_key);
@@ -150,8 +147,7 @@ JNIEXPORT jbyteArray JNICALL Java_im_tox_tox4j_impl_jni_ToxCryptoJni_toxPassKeyD
 
   pass_key_ptr pass_key = pass_key_from_java (env, passKeyArray);
 
-  LogEntry log_entry (tox_pass_key_decrypt);
-  return with_error_handling<ToxCrypto> (log_entry, env,
+  return with_error_handling<ToxCrypto> (env,
     [env, &out] (bool)
       {
         return toJavaArray (env, out);
@@ -177,8 +173,7 @@ JNIEXPORT jbyteArray JNICALL Java_im_tox_tox4j_impl_jni_ToxCryptoJni_toxPassKeyE
 
   pass_key_ptr pass_key = pass_key_from_java (env, passKeyArray);
 
-  LogEntry log_entry (tox_pass_key_encrypt);
-  return with_error_handling<ToxCrypto> (log_entry, env,
+  return with_error_handling<ToxCrypto> (env,
     [env, &out] (bool)
       {
         return toJavaArray (env, out);

lib/src/jvmMain/cpp/tox/common.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "util/debug_log.h"
-
 #include <cassert>
 #include <memory>
 
@@ -25,10 +23,7 @@ namespace tox
         invoke (Subsystem *tox, Args ...args, void *user_data)
         {
           assert (tox != nullptr);
-          LogEntry log_entry (Callback, args...);
-          return log_entry.print_result (
-            Callback, args..., static_cast<UserData *> (user_data)
-          ).unwrap ();
+          return Callback(args..., static_cast<UserData *> (user_data));
         }
 
         template<typename UserData, type<UserData> Callback>

lib/src/jvmMain/cpp/tox4j/ToxInstances.h

@@ -1,10 +1,11 @@
 #pragma once
 
+#include <iostream>
+
 #include "util/instance_manager.h"
+#include "util/jni/ArrayFromJava.h"
 #include "util/pp_cat.h"
-#include "util/debug_log.h"
-
-#include <iostream>
+#include "util/wrap_void.h"
 
 
 
@@ -55,9 +56,9 @@ struct conversions
   }
 
   static auto
-  to_java (JNIEnv *env, LogEntry &log_entry, ToxFunc func, Args ...args)
+  to_java (JNIEnv *env, ToxFunc func, Args ...args)
   {
-    return to_java (env, log_entry.print_result (func, from_java (args)...));
+    return to_java (env, wrap_void (func, from_java (args)...));
   }
 };
 
@@ -228,12 +229,9 @@ throw_tox_exception (JNIEnv *env, ErrorType error)
  * The return type of with_error_handling is the result type of calling
  * success_func with the return value of tox_func called with args.
  *
- * It stores the result of the function call in the passed LogEntry.
- *
  * @param Object Tox or ToxAV, the type of the first parameter to the tox
  *               function without pointer.
  *
- * @param log_entry A LogEntry to store the function result in.
  * @param env The current JNIEnv.
  * @param success_func Function to be called when the error code is OK.
  * @param tox_func The native function to call. Must have an error code as
@@ -243,8 +241,7 @@ throw_tox_exception (JNIEnv *env, ErrorType error)
  */
 template<typename Object, typename SuccessFunc, typename ToxFunc, typename ...Args>
 auto
-with_error_handling (LogEntry &log_entry,
-                     JNIEnv *env,
+with_error_handling (JNIEnv *env,
                      SuccessFunc success_func,
                      ToxFunc tox_func,
                      Args &&...args)
@@ -254,7 +251,7 @@ with_error_handling (LogEntry &log_entry,
   // Create an error code value and pass a pointer to the tox function.
   error_type error;
   auto value = conversions<ToxFunc, Args..., error_type *>::to_java (
-    env, log_entry, tox_func, std::forward<Args> (args)..., &error
+    env, tox_func, std::forward<Args> (args)..., &error
   );
   // Handle it, producing either a SUCCESS or a FAILURE with the error code.
   ErrorHandling result = handle_error_enum<error_type> (error);
@@ -283,8 +280,6 @@ with_error_handling (LogEntry &log_entry,
  * A Tox instance manager. In addition to the facilities provided by
  * instance_manager, this provides with_error_handling member functions for
  * tox error code to exception translation.
- *
- * All function calls are logged to a LogEntry.
  */
 template<typename ObjectP, typename EventsP>
 struct ToxInstances
@@ -307,9 +302,8 @@ struct ToxInstances
                        ToxFunc tox_func,
                        Args &&...args)
   {
-    LogEntry log_entry (tox_func, args...);
     return ::with_error_handling<Object> (
-      log_entry, env, success_func,
+      env, success_func,
       tox_func, std::forward<Args> (args)...
     );
   }
@@ -330,9 +324,8 @@ struct ToxInstances
       [&] (Object *tox, Events &events)
         {
           unused (events);
-          InstanceLogEntry log_entry (instanceNumber, tox_func, tox, args...);
           return ::with_error_handling<Object> (
-            log_entry, env, success_func,
+            env, success_func,
             tox_func, tox, std::forward<Args> (args)...
           );
         }
@@ -376,9 +369,8 @@ struct ToxInstances
       [&] (Object *tox, Events &events)
         {
           unused (events);
-          InstanceLogEntry log_entry (instanceNumber, tox_func, tox, args...);
           return conversions<ToxFunc, Object *, Args...>::to_java (
-            env, log_entry, tox_func, tox, std::forward<Args> (args)...
+            env, tox_func, tox, std::forward<Args> (args)...
           );
         }
     );