Changeset 102345 in vbox for trunk/src/libs/xpcom18a4/xpcom/string

Timestamp:

Nov 27, 2023 6:48:07 PM (17 months ago)

Author:

vboxsync

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

160481

Message:

libs/xpcom: Replace remaining APIs from prprf.h with IPRT equivalents, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/string/src

Files:

• nsPrintfCString.cpp (modified) (3 diffs)
• nsStringObsolete.cpp (modified) (5 diffs)

trunk/src/libs/xpcom18a4/xpcom/string/src/nsPrintfCString.cpp

@@ -39 +39 @@
 #include "nsPrintfCString.h"
 #include <stdarg.h>
-#include "prprf.h"
 
+#include <iprt/string.h>
 
 // though these classes define a fixed buffer, they do not set the F_FIXED
@@ -58 +58 @@
 
     va_start(ap, format);
-    mLength = PR_vsnprintf(mData, physical_capacity, format, ap);
+    ssize_t cch = RTStrPrintf2V(mData, physical_capacity, format, ap);
+    Assert(cch > 0);
+    mLength = (size_type)cch;
     va_end(ap);
   }
@@ -79 +81 @@
 
     va_start(ap, format);
-    mLength = PR_vsnprintf(mData, physical_capacity, format, ap);
+    ssize_t cch = RTStrPrintf2V(mData, physical_capacity, format, ap);
+    Assert(cch > 0);
+    mLength = (size_type)cch;
     va_end(ap);
   }

trunk/src/libs/xpcom18a4/xpcom/string/src/nsStringObsolete.cpp

@@ -51 +51 @@
 #include "nsCRT.h"
 #include "nsUTF8Utils.h"
-#include "prprf.h"
 
 #include <iprt/assert.h>
@@ -1132 +1131 @@
         fmt = "%x";
     }
-    PR_snprintf(buf, sizeof(buf), fmt, aInteger);
+    RTStrPrintf2(buf, sizeof(buf), fmt, aInteger);
     Append(buf);
   }
@@ -1152 +1151 @@
         fmt = "%x";
     }
-    PR_snprintf(buf, sizeof(buf), fmt, aInteger);
+    RTStrPrintf2(buf, sizeof(buf), fmt, aInteger);
     AppendASCIItoUTF16(buf, *this);
   }
@@ -1172 +1171 @@
         fmt = "%llx";
     }
-    PR_snprintf(buf, sizeof(buf), fmt, aInteger);
+    RTStrPrintf2(buf, sizeof(buf), fmt, aInteger);
     Append(buf);
   }
@@ -1192 +1191 @@
         fmt = "%llx";
     }
-    PR_snprintf(buf, sizeof(buf), fmt, aInteger);
+    RTStrPrintf2(buf, sizeof(buf), fmt, aInteger);
     AppendASCIItoUTF16(buf, *this);
   }