Changeset 47589 in vbox

Timestamp:

Aug 7, 2013 1:27:03 PM (11 years ago)

Author:

vboxsync

Message:

Small changes to tidy up 6787 Contrl VboxSV release logging

File:

• trunk/src/VBox/Main/src-server/SystemPropertiesImpl.cpp (modified) (2 diffs)

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

@@ -680 +680 @@
     else
     {
-        LogRel(("Cannot set passed logging level=%s, or the default one - Error=%Rrc \n", aLoggingLevel, rc));
+        LogRel(("Cannot set passed logging level=%ls, or the default one - Error=%Rrc \n", aLoggingLevel, rc));
     }
 
@@ -1284 +1284 @@
 HRESULT SystemProperties::setLoggingLevel(const Utf8Str &aLoggingLevel)
 {
-    HRESULT rc = S_OK;
+    int rc = S_OK;
     Utf8Str useLoggingLevel(aLoggingLevel);
     rc = RTLogGroupSettings(RTLogRelDefaultInstance(), useLoggingLevel.c_str());
     //  If failed and not the default logging level - try to use the default logging level.
-    if (!SUCCEEDED(rc)){
+    if (!RT_SUCCESS(rc))
+    {
         // If failed write message to the release log.
         LogRel(("Cannot set passed logging level=%s Error=%Rrc \n", useLoggingLevel.c_str(), rc));
         //  If attempted logging level not the default one then try the default one.
-        if (!useLoggingLevel.equals(VBOXSVC_LOG_DEFAULT)){
+        if (!useLoggingLevel.equals(VBOXSVC_LOG_DEFAULT))
+        {
             rc = RTLogGroupSettings(RTLogRelDefaultInstance(), VBOXSVC_LOG_DEFAULT);
             // If failed report this to the release log.
-            if (!SUCCEEDED(rc))
+            if (!RT_SUCCESS(rc))
                 LogRel(("Cannot set default logging level Error=%Rrc \n", rc));
         }