Cleared out warn-errors for logging-off version

Haivision · May 27, 2024 · d8cebcd · d8cebcd
1 parent 216c1ed
commit d8cebcd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/srtcore/group.cpp b/srtcore/group.cpp
@@ -15,6 +15,8 @@ extern const int32_t SRT_DEF_VERSION;
 
 namespace srt {
 
+static inline char fmt_onoff(bool val) { return val ? '+' : '-'; }
+
 int32_t CUDTGroup::s_tokenGen = 0;
 
 // [[using locked(this->m_GroupLock)]];
@@ -2189,10 +2191,9 @@ int CUDTGroup::recv(char* buf, int len, SRT_MSGCTRL& w_mc)
     {
         if (!m_bOpened || !m_bConnected)
         {
-            const char onoff[2] = {'-', '+'};
             LOGC(grlog.Error,
-                 log << "grp/recv: $" << id() << ": ABANDONING: opened" << onoff[m_bOpened]
-                     << " connected" << onoff[m_bConnected]);
+                 log << "grp/recv: $" << id() << ": ABANDONING: opened" << fmt_onoff(m_bOpened)
+                     << " connected" << fmt_onoff(m_bConnected));
             throw CUDTException(MJ_CONNECTION, MN_NOCONN, 0);
         }
 

diff --git a/srtcore/queue.h b/srtcore/queue.h
@@ -592,6 +592,10 @@ struct CMultiplexer
         , m_pRcvQueue(NULL)
         , m_pChannel(NULL)
         , m_pTimer(NULL)
+        , m_iPort(0)
+        , m_iIPversion(0)
+        , m_iRefCount(1)
+        , m_iID(-1)
     {
     }
 

diff --git a/testing/testactivemedia.cpp b/testing/testactivemedia.cpp
@@ -3,6 +3,11 @@
 
 using namespace std;
 
+#if ENABLE_LOGGING
+namespace {
+const char* fmt_yesno(bool b) { return b ? "yes" : "no"; }
+}
+#endif
 
 void SourceMedium::Runner()
 {
@@ -82,10 +87,9 @@ void TargetMedium::Runner()
                     return;
                 }
 
-                const char* yesno[2] = {"no", "yes"};
                 bool gotsomething = ready.wait_for(lg, chrono::seconds(1), [this] { return !running || !buffer.empty(); } );
                 LOGP(applog.Debug, "TargetMedium(", typeid(*med).name(), "): [", val.payload.size(), "] BUFFER update (timeout:",
-                        yesno[!gotsomething], " running: ", running, ")");
+                        fmt_yesno(!gotsomething), " running: ", running, ")");
                 if (::transmit_int_state || !running || !med || med->Broken())
                 {
                     LOGP(applog.Debug, "TargetMedium(", typeid(*med).name(), "): buffer empty, medium ",