Changeset 103505 in vbox for trunk

Timestamp:

Feb 21, 2024 7:25:15 PM (14 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161848

Message:

libs/xpcom: Fix some unused variable warnings, bugref:3409

Location:

trunk/src/libs/xpcom18a4

Files:

• ipc/ipcd/client/src/ipcdclient.cpp (modified) (1 diff)
• ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (1 diff)
• python/src/ErrorUtils.cpp (modified) (1 diff)
• python/src/VariantUtils.cpp (modified) (1 diff)
• vboxdeps.cpp (modified) (1 diff)
• xpcom/base/nsExceptionService.cpp (modified) (1 diff)
• xpcom/components/nsComponentManager.cpp (modified) (1 diff)
• xpcom/string/src/nsStringObsolete.cpp (modified) (2 diffs)
• xpcom/tests/TestArray.cpp (modified) (2 diffs)
• xpcom/tests/TestCRT.cpp (modified) (2 diffs)
• xpcom/threads/nsAutoLock.cpp (modified) (1 diff)
• xpcom/typelib/xpidl/xpidl.c (modified) (1 diff)
• xpcom/typelib/xpidl/xpidl_typelib.c (modified) (1 diff)
• xpcom/typelib/xpidl/xpidl_util.c (modified) (1 diff)
• xpcom/typelib/xpt/src/xpt_struct.c (modified) (1 diff)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp

@@ -1146 +1146 @@
             NS_ASSERTION(obs, "must at least have a default observer");
 
-            nsresult rv = obs->OnMessageAvailable(pClientState->u32ClientId, nsID(), 0, 1);
+            /*nsresult rv = */obs->OnMessageAvailable(pClientState->u32ClientId, nsID(), 0, 1);
             /* VBoxSVC/VBoxXPCOMIPCD auto-start can cause that a client up
              * message arrives while we're already waiting for a response

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -3267 +3267 @@
     return NS_ERROR_NOT_INITIALIZED;
 
+#ifdef LOG_ENABLED
   const DConnectOp *op = (const DConnectOp *) aData;
-
   Log (("ipcDConnectService::OnMessageAvailable: "
         "senderID=%d, opcode_major=%d, index=%d\n",
         aSenderID, op->opcode_major, op->request_index));
+#endif
 
   void *pvDataDup = RTMemDup(aData, aDataLen);

trunk/src/libs/xpcom18a4/python/src/ErrorUtils.cpp

@@ -80 +80 @@
 static const char *LOGGER_WARNING = "warning";
 static const char *LOGGER_ERROR = "error";
+#ifdef DEBUG
 static const char *LOGGER_DEBUG = "debug";
+#endif
 
 // Our "normal" error logger - calls back to the logging module.

trunk/src/libs/xpcom18a4/python/src/VariantUtils.cpp

@@ -2015 +2015 @@
                 PRUint8 array_type = (PRUint8)PyInt_AsLong(td.extra);
                 PRUint32 seq_size = GetSizeIs(index, PR_FALSE);
-                nsXPTCVariant &ns_viid = m_var_array[td.argnum];
-                nsIID iid;
-                nsresult res = GetArrayElementIID(m_parent,
-                                                  m_var_array,
-                                                  m_methodindex,
-                                                  index,
-                                                  &iid);
+    nsIID iid;
+    nsresult res = GetArrayElementIID(m_parent,
+                                      m_var_array,
+                                      m_methodindex,
+                                      index,
+                                      &iid);
                 ret = UnpackSingleArray(m_parent, * ((void **)ns_v.ptr),
                                         seq_size, array_type&XPT_TDP_TAGMASK,

trunk/src/libs/xpcom18a4/vboxdeps.cpp

@@ -56 +56 @@
     nsVoidHashSetSuper *a = new nsVoidHashSetSuper();
     a->Init(123);
-    nsDeque *b = new nsDeque();
+    nsDeque *b = new nsDeque(); RT_NOREF(b);
 
     //nsXPTCStubBase

trunk/src/libs/xpcom18a4/xpcom/base/nsExceptionService.cpp

@@ -184 +184 @@
   /* member initializers and constructor code */
   if (tlsIndex == NIL_RTTLS) {
+    /* Parfait_ALLOW unused-var Used for debug builds in the assertion below. */
     int vrc = RTTlsAllocEx( &tlsIndex, ThreadDestruct );
-    NS_WARN_IF_FALSE(RT_SUCCESS(vrc), "ScriptErrorService could not allocate TLS storage.");
+    NS_WARN_IF_FALSE(RT_SUCCESS(vrc), "ScriptErrorService could not allocate TLS storage."); RT_NOREF(vrc);
   }
   int vrc = RTSemFastMutexCreate(&lock);
-  NS_WARN_IF_FALSE(RT_SUCCESS(vrc), "Error allocating ExceptionService lock");
+  NS_WARN_IF_FALSE(RT_SUCCESS(vrc), "Error allocating ExceptionService lock"); RT_NOREF(vrc);
 
   // observe XPCOM shutdown.

trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

@@ -2730 +2730 @@
     // Normalize proid and classname
     const char *contractID = (aContractID && *aContractID) ? aContractID : nsnull;
-    const char *className = (aClassName && *aClassName) ? aClassName : nsnull;
 #ifdef LOG_ENABLED
     char *buf = aClass.ToString();

trunk/src/libs/xpcom18a4/xpcom/string/src/nsStringObsolete.cpp

@@ -1206 +1206 @@
     r64.rd = aFloat;
     ssize_t cch = RTStrFormatR64(buf, sizeof(buf), &r64, 0, 6 /*cchPrecision*/, 0 /*fFlags*/);
-    Assert(cch > 0);
+    Assert(cch > 0); RT_NOREF(cch);
     Append(buf);
   }
@@ -1217 +1217 @@
     r64.rd = aFloat;
     ssize_t cch = RTStrFormatR64(buf, sizeof(buf), &r64, 0, 6 /*cchPrecision*/, 0 /*fFlags*/);
-    Assert(cch > 0);
+    Assert(cch > 0); RT_NOREF(cch);
     AppendWithConversion(buf);
   }

trunk/src/libs/xpcom18a4/xpcom/tests/TestArray.cpp

@@ -37 +37 @@
  * ***** END LICENSE BLOCK ***** */
 
+#include <iprt/cdefs.h>
+
 #include <stdio.h>
 #include <stdlib.h>
@@ -109 +111 @@
   PRUint32 cnt = 0;
   nsresult rv = aArray->Count(&cnt);
-  NS_ASSERTION(NS_SUCCEEDED(rv), "Count failed");
+  NS_ASSERTION(NS_SUCCEEDED(rv), "Count failed"); RT_NOREF(rv);
   PRInt32 count = cnt;
   PRInt32 index;

trunk/src/libs/xpcom18a4/xpcom/tests/TestCRT.cpp

@@ -61 +61 @@
 static void Check(const char* s1, const char* s2, PRIntn n)
 {
+  /** @todo r=aeichner This test is pretty useless with release builds but do we really care? */
+#ifdef DEBUG
   PRIntn clib = RTStrCmp(s1, s2);
   PRIntn clib_n = RTStrNCmp(s1, s2, n);
@@ -72 +74 @@
   PRIntn u2 = nsCRT::strcmp(us1, us2);
   PRIntn u2_n = nsCRT::strncmp(us1, us2, n);
+#endif
 
   NS_ASSERTION(sign(clib) == sign(u2), "strcmp");

trunk/src/libs/xpcom18a4/xpcom/threads/nsAutoLock.cpp

@@ -58 +58 @@
 {
     PRStatus status = PR_ExitMonitor(mMonitor);
-    AssertMsg(status == PR_SUCCESS, ("PR_ExitMonitor failed"));
+    AssertMsg(status == PR_SUCCESS, ("PR_ExitMonitor failed")); RT_NOREF(status);
     mLockCount -= 1;
 }

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl.c

@@ -136 +136 @@
              * and string variables.
              */
-            const gchar* typelib_version_string = NULL;
 
             /* 

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_typelib.c

@@ -1154 +1154 @@
 {
     struct _IDL_CONST_DCL *dcl = &IDL_CONST_DCL(state->tree);
-    const char *name = IDL_IDENT(dcl->ident).str;
     gboolean is_long;
     gboolean sign;

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_util.c

@@ -408 +408 @@
                       ParamAttrType whattocheck)
 {
-    const char *method_name = IDL_IDENT(IDL_OP_DCL(method_tree).ident).str;
     const char *referred_name = NULL;
-    IDL_tree param_type = IDL_PARAM_DCL(param).param_type_spec;
     IDL_tree simple_decl = IDL_PARAM_DCL(param).simple_declarator;
-    const char *param_name = IDL_IDENT(simple_decl).str;
     const char *attr_name;
     const char *needed_type;

trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/src/xpt_struct.c

@@ -241 +241 @@
 XPT_DoHeader(XPTArena *arena, XPTCursor *cursor, XPTHeader **headerp)
 {
-    const int HEADER_SIZE = 24;
     XPTMode mode = cursor->state->mode;
     XPTHeader * header;