Changeset 94710 in vbox for trunk/src

Timestamp:

Apr 25, 2022 5:26:14 PM (3 years ago)

Author:

vboxsync

Message:

Main/Update check: Docs nits, formatting, logging tweaks. bugref:7983

File:

• trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/UpdateAgentImpl.cpp

@@ -99 +99 @@
  * Returns platform information as a string.
  *
- * @returns HRESULT
+ * @returns Platform information as string.
  */
 /* static */
@@ -233 +233 @@
     }
 
-    LogRelFunc(("strPlatform (Linux) = %s\n", strPlatform.c_str()));
-
     if (RT_FAILURE(vrc))
 # endif /* RT_OS_LINUX */
@@ -259 +257 @@
         if (!strPlatform.endsWith("]"))
             strPlatform.append("]");
-
-        LogRelFunc(("strPlatform = %s\n", strPlatform.c_str()));
-    }
+    }
+
+    LogRel2(("UpdateAgent: Platform is '%s'\n", strPlatform.c_str()));
 
     return strPlatform;
@@ -745 +743 @@
     va_start(va, pcszMsgFmt);
 
-     char *psz = NULL;
-     if (RTStrAPrintfV(&psz, pcszMsgFmt, va) <= 0)
-         return E_OUTOFMEMORY;
-
-     LogRel(("Update agent (%s): %s\n", mData.m_strName.c_str(), psz));
-
-     ::FireUpdateAgentErrorEvent(m_EventSource, psz, vrc);
-
-     HRESULT const rc = setErrorVrc(VERR_COM_IPRT_ERROR /** @todo Translate HTTP errors to COM? */, pcszMsgFmt, va);
-
-     va_end(va);
-     RTStrFree(psz);
-
-     return rc;
+    char *psz = NULL;
+    if (RTStrAPrintfV(&psz, pcszMsgFmt, va) <= 0)
+     return E_OUTOFMEMORY;
+
+    LogRel(("Update agent (%s): %s\n", mData.m_strName.c_str(), psz));
+
+    ::FireUpdateAgentErrorEvent(m_EventSource, psz, vrc);
+
+    HRESULT const rc = setErrorVrc(VERR_COM_IPRT_ERROR /** @todo Translate HTTP errors to COM? */, pcszMsgFmt, va);
+
+    va_end(va);
+    RTStrFree(psz);
+
+    return rc;
 }
 
@@ -1071 +1069 @@
                                    rc, cchWord0, pchWord0, cchWord1, pchWord1);
 
-            LogRel(("Update agent (%s): HTTP server replied: %.*s %.*s\n",
-                    mData.m_strName.c_str(), cchWord0, pchWord0, cchWord1, pchWord1));
+            LogRel2(("Update agent (%s): HTTP server replied: %.*s %.*s\n",
+                     mData.m_strName.c_str(), cchWord0, pchWord0, cchWord1, pchWord1));
         }
         else