Changeset 28692 in vbox

Timestamp:

Apr 24, 2010 7:14:03 PM (15 years ago)

Author:

vboxsync

Message:

iprt: XmlFileWrite - expose the two suffixes write() uses when fSafe is set.

Location:

trunk

Files:

• include/iprt/cpp/xml.h (modified) (1 diff)
• src/VBox/Runtime/r3/xml.cpp (modified) (2 diffs)

trunk/include/iprt/cpp/xml.h

@@ -683 +683 @@
      *                                 specified name.
      *                              -# The directory changes are flushed to disk.
+     *                          The suffixes are available via s_pszTmpSuff and
+     *                          s_pszPrevSuff.
      */
     void write(const char *pcszFilename, bool fSafe);
 
     static int WriteCallback(void *aCtxt, const char *aBuf, int aLen);
-    static int CloseCallback (void *aCtxt);
+    static int CloseCallback(void *aCtxt);
+
+    /** The suffix used by XmlFileWriter::write() for the temporary file. */
+    static const char * const s_pszTmpSuff;
+    /** The suffix used by XmlFileWriter::write() for the previous (backup) file. */
+    static const char * const s_pszPrevSuff;
 
 private:

trunk/src/VBox/Runtime/r3/xml.cpp

@@ -1534 +1534 @@
         /* Construct both filenames first to ease error handling.  */
         char szTmpFilename[RTPATH_MAX];
-        int rc = RTStrCopy(szTmpFilename, sizeof(szTmpFilename) - sizeof("-tmp") + 1, pcszFilename);
+        int rc = RTStrCopy(szTmpFilename, sizeof(szTmpFilename) - strlen(s_pszTmpSuff), pcszFilename);
         if (RT_FAILURE(rc))
             throw EIPRTFailure(rc, "RTStrCopy");
-        strcat(szTmpFilename, "-tmp");
+        strcat(szTmpFilename, s_pszTmpSuff);
 
         char szPrevFilename[RTPATH_MAX];
-        rc = RTStrCopy(szPrevFilename, sizeof(szPrevFilename) - sizeof("-prev") + 1, pcszFilename);
+        rc = RTStrCopy(szPrevFilename, sizeof(szPrevFilename) - strlen(s_pszPrevSuff), pcszFilename);
         if (RT_FAILURE(rc))
             throw EIPRTFailure(rc, "RTStrCopy");
-        strcat(szPrevFilename, "-prev");
+        strcat(szPrevFilename, s_pszPrevSuff);
 
         /* Write the XML document to the temporary file.  */
@@ -1591 +1591 @@
 }
 
+/*static*/ const char * const XmlFileWriter::s_pszTmpSuff  = "-tmp";
+/*static*/ const char * const XmlFileWriter::s_pszPrevSuff = "-prev";
+
 
 } // end namespace xml