Changeset 34938 in vbox

Timestamp:

Dec 10, 2010 9:15:46 AM (14 years ago)

Author:

vboxsync

Message:

ExtPackManager: use VBOX_EXTPACK_LICENSE_NAME_PREFIX

Location:

trunk/src/VBox/Main

Files:

• ExtPackManagerImpl.cpp (modified) (2 diffs)
• include/ExtPackUtil.h (modified) (1 diff)

trunk/src/VBox/Main/ExtPackManagerImpl.cpp

@@ -450 +450 @@
      * Combine the options to form a file name before locking down anything.
      */
-    char szName[sizeof("ExtPack-license-de_DE.html") + 2];
+    char szName[sizeof(VBOX_EXTPACK_LICENSE_NAME_PREFIX "-de_DE.html") + 2];
     if (strPreferredLocale.isNotEmpty() && strPreferredLanguage.isNotEmpty())
-        RTStrPrintf(szName, sizeof(szName), "ExtPack-license-%s_%s.%s",
+        RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-%s_%s.%s",
                     strPreferredLocale.c_str(), strPreferredLanguage.c_str(), strFormat.c_str());
     else if (strPreferredLocale.isNotEmpty())
-        RTStrPrintf(szName, sizeof(szName), "ExtPack-license-%s.%s",  strPreferredLocale.c_str(), strFormat.c_str());
+        RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-%s.%s",  strPreferredLocale.c_str(), strFormat.c_str());
     else if (strPreferredLanguage.isNotEmpty())
-        RTStrPrintf(szName, sizeof(szName), "ExtPack-license-_%s.%s", strPreferredLocale.c_str(), strFormat.c_str());
+        RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-_%s.%s", strPreferredLocale.c_str(), strFormat.c_str());
     else
-        RTStrPrintf(szName, sizeof(szName), "ExtPack-license.%s",     strFormat.c_str());
+        RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX ".%s",     strFormat.c_str());
 
     /*
@@ -1607 +1607 @@
      * Combine the options to form a file name before locking down anything.
      */
-    char szName[sizeof("ExtPack-license-de_DE.html") + 2];
+    char szName[sizeof(VBOX_EXTPACK_LICENSE_NAME_PREFIX "-de_DE.html") + 2];
     if (strPreferredLocale.isNotEmpty() && strPreferredLanguage.isNotEmpty())
-        RTStrPrintf(szName, sizeof(szName), "ExtPack-license-%s_%s.%s",
+        RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-%s_%s.%s",
                     strPreferredLocale.c_str(), strPreferredLanguage.c_str(), strFormat.c_str());
     else if (strPreferredLocale.isNotEmpty())
-        RTStrPrintf(szName, sizeof(szName), "ExtPack-license-%s.%s",  strPreferredLocale.c_str(), strFormat.c_str());
+        RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-%s.%s",  strPreferredLocale.c_str(), strFormat.c_str());
     else if (strPreferredLanguage.isNotEmpty())
-        RTStrPrintf(szName, sizeof(szName), "ExtPack-license-_%s.%s", strPreferredLocale.c_str(), strFormat.c_str());
+        RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-_%s.%s", strPreferredLocale.c_str(), strFormat.c_str());
     else
-        RTStrPrintf(szName, sizeof(szName), "ExtPack-license.%s",     strFormat.c_str());
+        RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX ".%s",     strFormat.c_str());
 
     /*

trunk/src/VBox/Main/include/ExtPackUtil.h

@@ -38 +38 @@
  * and format (HTML, RTF, plain text). All extension packages shall include
  * a  */
-#define VBOX_EXTPACK_LICENSE_NAME_PREFIX "ExtPack.license"
+#define VBOX_EXTPACK_LICENSE_NAME_PREFIX "ExtPack-license"
 /** @name VBOX_EXTPACK_SUFFIX
  * The suffix of a extension pack tarball. */