Changeset 85685 in vbox

Timestamp:

Aug 11, 2020 11:45:47 AM (5 years ago)

Author:

vboxsync

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

139822

Message:

FE/VBoxManage: fix build: strcasecmp() should be RTStrICmp() and supply an option to the RTGETOPTDEF array for now

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageUpdateCheck.cpp (modified) (3 diffs)
• Main/src-server/HostUpdateImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageUpdateCheck.cpp

@@ -47 +47 @@
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    static const RTGETOPTDEF s_aOptions[] = {};
+    /** @todo r=brent decide on the best approach for options to specify here */
+    static const RTGETOPTDEF s_aOptions[] = 
+    {
+        { "--verbose",       'v',        RTGETOPT_REQ_NOTHING }
+    };
     int vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0 /* First */, 0);
     AssertRCReturn(vrc, RTEXITCODE_INIT);
@@ -183 +187 @@
     {
         VBoxUpdateTarget_T enmVBoxUpdateTarget;
-        if (!strcasecmp(pszVBoxUpdateTarget, "stable"))
+        if (!RTStrICmp(pszVBoxUpdateTarget, "stable"))
             enmVBoxUpdateTarget = VBoxUpdateTarget_Stable;
-        else if (!strcasecmp(pszVBoxUpdateTarget, "withbetas"))
+        else if (!RTStrICmp(pszVBoxUpdateTarget, "withbetas"))
             enmVBoxUpdateTarget = VBoxUpdateTarget_WithBetas;
-        else if (!strcasecmp(pszVBoxUpdateTarget, "allreleases"))
+        else if (!RTStrICmp(pszVBoxUpdateTarget, "allreleases"))
             enmVBoxUpdateTarget = VBoxUpdateTarget_AllReleases;
         else
@@ -217 +221 @@
     RTGETOPTUNION ValueUnion;
     RTGETOPTSTATE GetState;
-    static const RTGETOPTDEF s_aOptions[] = {};
+    /** @todo r=brent decide on the best approach for options to specify here */
+    static const RTGETOPTDEF s_aOptions[] =
+    {
+        { "--verbose",       'v',        RTGETOPT_REQ_NOTHING }
+    };
     int vrc = RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0 /* First */, 0);
     AssertRCReturn(vrc, RTEXITCODE_INIT);

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

@@ -89 +89 @@
     HRESULT rc = pHostUpdate->i_updateCheckTask(this);
 
-    LogFlowFunc(("rc=%Rhrc\n", rc));
+    LogFlowFunc(("rc=%Rhrc\n", rc)); NOREF(rc);
     LogFlowFuncLeave();
 }