Avoid some clang warnings in C++ code.

iphydf · iphydf · commit 5c40fe4b6212 · 2018-10-10T14:03:06.000Z
diff --git a/cpp/src/ToxAv/ToxAv.h b/cpp/src/ToxAv/ToxAv.h
@@ -16,6 +16,8 @@
 #define PREFIX    toxav
 #endif
 
+void reference_symbols_av ();
+
 namespace av
 {
   namespace proto = im::tox::tox4j::av::proto;
diff --git a/cpp/src/ToxAv/lifecycle.cpp b/cpp/src/ToxAv/lifecycle.cpp
@@ -105,10 +105,11 @@ toxav_new_unique (Tox *tox, TOXAV_ERR_NEW *error)
 }
 
 
-static void
+static NORETURN void
 toxav_finalize ()
 {
-  assert (!"This function is only here for register_funcs and should never be called.");
+  fprintf (stderr, "This function is only here for register_funcs and should never be called.");
+  abort ();
 }
 
 
diff --git a/cpp/src/ToxCore/ToxCore.cpp b/cpp/src/ToxCore/ToxCore.cpp
@@ -9,20 +9,21 @@ template<> char const *exn_prefix<Tox>() { return ""; }
 
 #include "generated/impls.h"
 
+#define TOX_DEFAULT_PROXY_PORT  8080
+#define TOX_DEFAULT_TCP_PORT    0
+#define TOX_DEFAULT_START_PORT  33445
+#define TOX_DEFAULT_END_PORT    (TOX_DEFAULT_START_PORT + 100)
+#include "generated/constants.h"
+
 void
 reference_symbols_core ()
 {
   int tox_finalize; // For Java only.
 
+  checkToxCoreConstants();
 #define JAVA_METHOD_REF(NAME)  unused (JAVA_METHOD_NAME (NAME));
 #define CXX_FUNCTION_REF(NAME) unused (NAME);
 #include "generated/natives.h"
 #undef CXX_FUNCTION_REF
 #undef JAVA_METHOD_REF
 }
-
-#define TOX_DEFAULT_PROXY_PORT  8080
-#define TOX_DEFAULT_TCP_PORT    0
-#define TOX_DEFAULT_START_PORT  33445
-#define TOX_DEFAULT_END_PORT    (TOX_DEFAULT_START_PORT + 100)
-#include "generated/constants.h"
diff --git a/cpp/src/ToxCore/ToxCore.h b/cpp/src/ToxCore/ToxCore.h
@@ -16,6 +16,8 @@
 #define PREFIX    tox
 #endif
 
+void reference_symbols_core ();
+
 namespace core
 {
   namespace proto = im::tox::tox4j::core::proto;
diff --git a/cpp/src/ToxCore/generated/constants.h b/cpp/src/ToxCore/generated/constants.h
@@ -1,5 +1,5 @@
 // im.tox.tox4j.core.ToxCoreConstants$
-void
+static void 
 checkToxCoreConstants ()
 {
   static_assert (TOX_ADDRESS_SIZE == 38, "Java constant out of sync with C");
diff --git a/cpp/src/ToxCore/lifecycle.cpp b/cpp/src/ToxCore/lifecycle.cpp
@@ -212,10 +212,11 @@ tox_new_unique (Tox_Options const *options, TOX_ERR_NEW *error)
 }
 
 
-static void
+static NORETURN void
 tox_finalize ()
 {
-  assert (!"This function is only here for register_funcs and should never be called.");
+  fprintf (stderr, "This function is only here for register_funcs and should never be called.");
+  abort ();
 }
 
 
diff --git a/cpp/src/ToxCrypto/ToxCrypto.cpp b/cpp/src/ToxCrypto/ToxCrypto.cpp
@@ -17,6 +17,7 @@ template<> char const *exn_prefix<ToxCrypto>() { return ""; }
 void
 reference_symbols_crypto ()
 {
+  checkToxCryptoConstants ();
 #define JAVA_METHOD_REF(NAME)  unused (JAVA_METHOD_NAME (NAME));
 #define CXX_FUNCTION_REF(NAME) unused (NAME);
 #include "generated/natives.h"
diff --git a/cpp/src/ToxCrypto/ToxCrypto.h b/cpp/src/ToxCrypto/ToxCrypto.h
@@ -12,4 +12,6 @@
 #define PREFIX    tox
 
 
+void reference_symbols_crypto ();
+
 struct ToxCrypto;
diff --git a/cpp/src/ToxCrypto/generated/constants.h b/cpp/src/ToxCrypto/generated/constants.h
@@ -1,5 +1,5 @@
 // im.tox.tox4j.crypto.ToxCryptoConstants$
-void
+static void 
 checkToxCryptoConstants ()
 {
   static_assert (TOX_PASS_BOX_ZERO_BYTES == 16, "Java constant out of sync with C");
diff --git a/cpp/src/tox4j/Tox4j.h b/cpp/src/tox4j/Tox4j.h
@@ -11,6 +11,13 @@
 #include "util/to_bytes.h"
 
 
+#if defined(__GNUC__)
+#define NORETURN __attribute__((__noreturn__))
+#else
+#define NORETURN
+#endif
+
+
 #define JAVA_METHOD_NAME(NAME) \
   PP_CAT(Java_im_tox_tox4j_impl_jni_, PP_CAT(CLASS, PP_CAT(Jni_, NAME)))
 
diff --git a/cpp/src/util/debug_log.cpp b/cpp/src/util/debug_log.cpp
@@ -39,24 +39,24 @@ struct JniLog::data
 
 
 JniLog::Entry::Entry (data *log, protolog::JniLogEntry *entry, std::unique_lock<std::recursive_mutex> lock)
-  : log (log)
-  , entry (entry)
-  , lock (std::move (lock))
+  : log_ (log)
+  , entry_ (entry)
+  , lock_ (std::move (lock))
 {
 }
 
 
 JniLog::Entry::~Entry ()
 {
   // Check if this entry needs to be filtered out.
-  if (entry && std::find (log->filters.begin (), log->filters.end (), entry->name ()) != log->filters.end ())
+  if (entry_ && std::find (log_->filters.begin (), log_->filters.end (), entry_->name ()) != log_->filters.end ())
     {
-      auto *entries = log->log.mutable_entries ();
+      auto *entries = log_->log.mutable_entries ();
 
       // Search for the current entry in the recently added entries.
       auto found = std::find_if (entries->rbegin (), entries->rend (),
         [this](auto const &element)
-        { return &element == entry; }
+        { return &element == entry_; }
       );
 
       // This would mean the log was cleared before the mutex was unlocked.
diff --git a/cpp/src/util/debug_log.h b/cpp/src/util/debug_log.h
@@ -268,14 +268,14 @@ struct JniLog
     Entry (data *log = nullptr, protolog::JniLogEntry *entry = nullptr, std::unique_lock<std::recursive_mutex> lock = { });
     ~Entry ();
 
-    protolog::JniLogEntry *operator -> () const { return  entry; }
-    protolog::JniLogEntry &operator *  () const { return *entry; }
-    explicit operator bool () const { return entry; }
+    protolog::JniLogEntry *operator -> () const { return  entry_; }
+    protolog::JniLogEntry &operator *  () const { return *entry_; }
+    explicit operator bool () const { return entry_; }
 
   private:
-    data *log;
-    protolog::JniLogEntry *entry;
-    std::unique_lock<std::recursive_mutex> lock;
+    data *log_;
+    protolog::JniLogEntry *entry_;
+    std::unique_lock<std::recursive_mutex> lock_;
   };
 
   JniLog ();
diff --git a/cpp/src/util/exceptions.cpp b/cpp/src/util/exceptions.cpp
@@ -86,5 +86,5 @@ throw_tox_exception (JNIEnv *env, char const *module, char const *prefix, char c
     return;
   tox4j_assert (exception);
 
-  env->Throw ((jthrowable)exception);
+  env->Throw (static_cast<jthrowable>(exception));
 }
diff --git a/src/test/java/im/tox/tox4j/impl/jni/codegen/JniConstants.scala b/src/test/java/im/tox/tox4j/impl/jni/codegen/JniConstants.scala
@@ -11,7 +11,7 @@ object JniConstants extends CodeGenerator {
     val clazz = constants.getClass
 
     Fun(
-      returnType = Type.void,
+      returnType = Static(Type.void),
       name = "check" + clazz.getSimpleName.replace("$", ""),
       params = Seq(),
       body = CompoundStmt(
diff --git a/src/test/java/im/tox/tox4j/impl/jni/codegen/cxx/Ast.scala b/src/test/java/im/tox/tox4j/impl/jni/codegen/cxx/Ast.scala
@@ -9,6 +9,7 @@ object Ast {
   sealed trait Type
 
   final case class Typename(name: String) extends Type
+  final case class Static(inner: Type) extends Type
   final case class Const(inner: Type) extends Type
   final case class Pointer(inner: Type) extends Type
   final case class Reference(inner: Type) extends Type
diff --git a/src/test/java/im/tox/tox4j/impl/jni/codegen/cxx/Print.scala b/src/test/java/im/tox/tox4j/impl/jni/codegen/cxx/Print.scala
@@ -25,6 +25,7 @@ object Print {
   private def printTypeInner(ty: Type): Doc = {
     ty match {
       case Typename(name)   => text(name) :: space
+      case Static(inner)    => "static " :: printTypeInner(inner)
       case Const(inner)     => printTypeInner(inner) :: "const "
       case Pointer(inner)   => printTypeInner(inner) :: "*"
       case Reference(inner) => printTypeInner(inner) :: "&"

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`#define PREFIX toxav`
`17`	`17`	`#endif`
`18`	`18`
	`19`	`+void reference_symbols_av ();`
	`20`	`+`
`19`	`21`	`namespace av`
`20`	`22`	`{`
`21`	`23`	`namespace proto = im::tox::tox4j::av::proto;`
Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,11 @@ toxav_new_unique (Tox tox, TOXAV_ERR_NEW error)`
`105`	`105`	`}`
`106`	`106`
`107`	`107`
`108`		`-static void`
	`108`	`+static NORETURN void`
`109`	`109`	`toxav_finalize ()`
`110`	`110`	`{`
`111`		`- assert (!"This function is only here for register_funcs and should never be called.");`
	`111`	`+ fprintf (stderr, "This function is only here for register_funcs and should never be called.");`
	`112`	`+ abort ();`
`112`	`113`	`}`
`113`	`114`
`114`	`115`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// im.tox.tox4j.core.ToxCoreConstants$`
`2`		`-void`
	`2`	`+static void`
`3`	`3`	`checkToxCoreConstants ()`
`4`	`4`	`{`
`5`	`5`	`static_assert (TOX_ADDRESS_SIZE == 38, "Java constant out of sync with C");`
Original file line number	Diff line number	Diff line change
`@@ -212,10 +212,11 @@ tox_new_unique (Tox_Options const options, TOX_ERR_NEW error)`
`212`	`212`	`}`
`213`	`213`
`214`	`214`
`215`		`-static void`
	`215`	`+static NORETURN void`
`216`	`216`	`tox_finalize ()`
`217`	`217`	`{`
`218`		`- assert (!"This function is only here for register_funcs and should never be called.");`
	`218`	`+ fprintf (stderr, "This function is only here for register_funcs and should never be called.");`
	`219`	`+ abort ();`
`219`	`220`	`}`
`220`	`221`
`221`	`222`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ template<> char const *exn_prefix<ToxCrypto>() { return ""; }`
`17`	`17`	`void`
`18`	`18`	`reference_symbols_crypto ()`
`19`	`19`	`{`
	`20`	`+ checkToxCryptoConstants ();`
`20`	`21`	`#define JAVA_METHOD_REF(NAME) unused (JAVA_METHOD_NAME (NAME));`
`21`	`22`	`#define CXX_FUNCTION_REF(NAME) unused (NAME);`
`22`	`23`	`#include "generated/natives.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`// im.tox.tox4j.crypto.ToxCryptoConstants$`
`2`		`-void`
	`2`	`+static void`
`3`	`3`	`checkToxCryptoConstants ()`
`4`	`4`	`{`
`5`	`5`	`static_assert (TOX_PASS_BOX_ZERO_BYTES == 16, "Java constant out of sync with C");`