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

Timestamp:

Nov 20, 2013 1:58:46 PM (11 years ago)

Author:

vboxsync

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

90786

Message:

newer gcc versions require a space between literal and identifier

Location:

trunk/src/VBox/Main/src-server

Files:

• ApplianceImplExport.cpp (modified) (1 diff)
• ApplianceImplImport.cpp (modified) (2 diffs)
• VFSExplorerImpl.cpp (modified) (2 diffs)
• generic/NetIf-generic.cpp (modified) (3 diffs)

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

@@ -2417 +2417 @@
         }
         /* Next we have to upload the OVF & all disk images */
-        vrc = RTS3Create(&hS3, pTask->locInfo.strUsername.c_str(), pTask->locInfo.strPassword.c_str(), pTask->locInfo.strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
+        vrc = RTS3Create(&hS3, pTask->locInfo.strUsername.c_str(), pTask->locInfo.strPassword.c_str(), pTask->locInfo.strHostname.c_str(), "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,

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

@@ -1295 +1295 @@
                          pTask->locInfo.strPassword.c_str(),
                          pTask->locInfo.strHostname.c_str(),
-                         "virtualbox-agent/"VBOX_VERSION_STRING);
+                         "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,
@@ -1888 +1888 @@
                          pTask->locInfo.strPassword.c_str(),
                          pTask->locInfo.strHostname.c_str(),
-                         "virtualbox-agent/"VBOX_VERSION_STRING);
+                         "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(VBOX_E_IPRT_ERROR,

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

@@ -426 +426 @@
     try
     {
-        int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(), m->strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
+        int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(),
+                             m->strHostname.c_str(), "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(E_FAIL, tr ("Can't open S3 storage service (%Rrc)"), vrc);
@@ -504 +505 @@
     try
     {
-        int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(), m->strHostname.c_str(), "virtualbox-agent/"VBOX_VERSION_STRING);
+        int vrc = RTS3Create(&hS3, m->strUsername.c_str(), m->strPassword.c_str(),
+                             m->strHostname.c_str(), "virtualbox-agent/" VBOX_VERSION_STRING);
         if (RT_FAILURE(vrc))
             throw setError(E_FAIL, tr ("Can't open S3 storage service (%Rrc)"), vrc);

trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp

@@ -276 +276 @@
                                                  COM_IIDOF(IHostNetworkInterface),
                                                  HostNetworkInterface::getStaticComponentName(),
-                                                 "Failed to execute '"VBOXNETADPCTL_NAME " add' (exit status: %d)", rc);
+                                                 "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d)", rc);
                         rc = VERR_INTERNAL_ERROR;
                     }
@@ -287 +287 @@
                                              COM_IIDOF(IHostNetworkInterface),
                                              HostNetworkInterface::getStaticComponentName(),
-                                             "Failed to execute '"VBOXNETADPCTL_NAME " add' (exit status: %d). Check permissions!", rc);
+                                             "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d). Check permissions!", rc);
                     pclose(fp);
                 }
@@ -340 +340 @@
                                          COM_IIDOF(IHostNetworkInterface),
                                          HostNetworkInterface::getStaticComponentName(),
-                                         "Failed to execute '"VBOXNETADPCTL_NAME "' (exit status: %d)", rc);
+                                         "Failed to execute '" VBOXNETADPCTL_NAME "' (exit status: %d)", rc);
             else
                 progress->notifyComplete(S_OK);