Changeset 36617 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Apr 7, 2011 7:28:24 PM (14 years ago)

Author:

vboxsync

Message:

Main: gcc warning

File:

• trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (modified) (4 diffs)

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

@@ -1121 +1121 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    const char *url;
-
     NOREF(aVersion);
 
-    static const struct {
+    static const struct
+    {
         FirmwareType_T type;
         const char*    fileName;
@@ -1160 +1159 @@
 
         Utf8Str shortName, fullName;
-        int rc;
 
         shortName = Utf8StrFmt("Firmware%c%s",
                                RTPATH_DELIMITER,
                                firmwareDesc[i].fileName);
-        rc = calculateFullPath(shortName, fullName); AssertRCReturn(rc, rc);
+        int rc = calculateFullPath(shortName, fullName);
+        AssertRCReturn(rc, rc);
         if (RTFileExists(fullName.c_str()))
         {
             *aResult = TRUE;
-             if (aFile)
+            if (aFile)
                 Utf8Str(fullName).cloneTo(aFile);
             break;
@@ -1175 +1174 @@
 
         char pszVBoxPath[RTPATH_MAX];
-        rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX); AssertRCReturn(rc, rc);
+        rc = RTPathExecDir(pszVBoxPath, RTPATH_MAX);
+        AssertRCReturn(rc, rc);
         fullName = Utf8StrFmt("%s%c%s",
                               pszVBoxPath,
@@ -1188 +1188 @@
         }
 
-
-        url = firmwareDesc[i].url;
         /** @todo: account for version in the URL */
         if (aUrl != NULL)