Changeset 108141 in vbox

Timestamp:

Feb 10, 2025 2:25:10 PM (11 days ago)

Author:

vboxsync

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

167442

Message:

Runtime/RTAcpi*: Some new helpers to allow format strings for name strings and string objects, bugref:10733

Location:

trunk

Files:

• include/iprt/acpi.h (modified) (2 diffs)
• include/iprt/mangling.h (modified) (2 diffs)
• src/VBox/Runtime/common/acpi/acpi.cpp (modified) (2 diffs)

trunk/include/iprt/acpi.h

@@ -406 +406 @@
 
 /**
+ * Appends a new String object - format string variant.
+ *
+ * @returns IPRT status code.
+ * @param   hAcpiTbl            The ACPI table handle.
+ * @param   pszNameFmt          The format string to build the name string from.
+ * @param   ...                 Arguments for the format string.
+ */
+RTDECL(int) RTAcpiTblNameStringAppendF(RTACPITBL hAcpiTbl, const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR(2, 3);
+
+
+/**
+ * Appends a new String object - format string variant.
+ *
+ * @returns IPRT status code.
+ * @param   hAcpiTbl            The ACPI table handle.
+ * @param   pszNameFmt          The format string to build the name string from.
+ * @param   va                  The format arguments.
+ */
+RTDECL(int) RTAcpiTblNameStringAppendV(RTACPITBL hAcpiTbl, const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
+
+
+/**
  * Appends a new String object.
  *
@@ -413 +435 @@
  */
 RTDECL(int) RTAcpiTblStringAppend(RTACPITBL hAcpiTbl, const char *psz);
+
+
+/**
+ * Appends a new String object - format string variant.
+ *
+ * @returns IPRT status code.
+ * @param   hAcpiTbl            The ACPI table handle.
+ * @param   pszFmt              The format string to build the string from.
+ * @param   ...                 Arguments for the format string.
+ */
+RTDECL(int) RTAcpiTblStringAppendF(RTACPITBL hAcpiTbl, const char *pszFmt, ...) RT_IPRT_FORMAT_ATTR(2, 3);
+
+
+/**
+ * Appends a new String object - format string variant.
+ *
+ * @returns IPRT status code.
+ * @param   hAcpiTbl            The ACPI table handle.
+ * @param   pszFmt              The format string to build the string from.
+ * @param   va                  The format arguments.
+ */
+RTDECL(int) RTAcpiTblStringAppendV(RTACPITBL hAcpiTbl, const char *pszFmt, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 

trunk/include/iprt/mangling.h

@@ -418 +418 @@
 # define RTAcpiTblNameAppend                            RT_MANGLER(RTAcpiTblNameAppend)
 # define RTAcpiTblNameStringAppend                      RT_MANGLER(RTAcpiTblNameStringAppend)
+# define RTAcpiTblNameStringAppendF                     RT_MANGLER(RTAcpiTblNameStringAppendF)
+# define RTAcpiTblNameStringAppendV                     RT_MANGLER(RTAcpiTblNameStringAppendV)
 # define RTAcpiTblNullNameAppend                        RT_MANGLER(RTAcpiTblNullNameAppend)
 # define RTAcpiTblOpRegionAppend                        RT_MANGLER(RTAcpiTblOpRegionAppend)
@@ -433 +435 @@
 # define RTAcpiTblStringAppend                          RT_MANGLER(RTAcpiTblStringAppend)
 # define RTAcpiTblStringAppendAsUtf16                   RT_MANGLER(RTAcpiTblStringAppendAsUtf16)
+# define RTAcpiTblStringAppendF                         RT_MANGLER(RTAcpiTblStringAppendF)
+# define RTAcpiTblStringAppendV                         RT_MANGLER(RTAcpiTblStringAppendV)
 # define RTAcpiTblUuidAppend                            RT_MANGLER(RTAcpiTblUuidAppend)
 # define RTAcpiTblUuidAppendFromStr                     RT_MANGLER(RTAcpiTblUuidAppendFromStr)

trunk/src/VBox/Runtime/common/acpi/acpi.cpp

@@ -981 +981 @@
 
 
+RTDECL(int) RTAcpiTblNameStringAppendF(RTACPITBL hAcpiTbl, const char *pszNameFmt, ...)
+{
+    va_list va;
+    va_start(va, pszNameFmt);
+    int rc = RTAcpiTblNameStringAppendV(hAcpiTbl, pszNameFmt, va);
+    va_end(va);
+    return rc;
+}
+
+
+RTDECL(int) RTAcpiTblNameStringAppendV(RTACPITBL hAcpiTbl, const char *pszNameFmt, va_list va)
+{
+    char szName[512];
+    ssize_t cch = RTStrPrintf2V(&szName[0], sizeof(szName), pszNameFmt, va);
+    if (cch <= 0)
+        return VERR_BUFFER_OVERFLOW;
+
+    return RTAcpiTblNameStringAppend(hAcpiTbl, &szName[0]);
+}
+
+
 RTDECL(int) RTAcpiTblStringAppend(RTACPITBL hAcpiTbl, const char *psz)
 {
@@ -989 +1010 @@
     rtAcpiTblAppendData(pThis, psz, (uint32_t)strlen(psz) + 1);
     return pThis->rcErr;
+}
+
+
+RTDECL(int) RTAcpiTblStringAppendF(RTACPITBL hAcpiTbl, const char *pszNameFmt, ...)
+{
+    va_list va;
+    va_start(va, pszNameFmt);
+    int rc = RTAcpiTblStringAppendV(hAcpiTbl, pszNameFmt, va);
+    va_end(va);
+    return rc;
+}
+
+
+RTDECL(int) RTAcpiTblStringAppendV(RTACPITBL hAcpiTbl, const char *pszNameFmt, va_list va)
+{
+    char szName[512];
+    ssize_t cch = RTStrPrintf2V(&szName[0], sizeof(szName), pszNameFmt, va);
+    if (cch <= 0)
+        return VERR_BUFFER_OVERFLOW;
+
+    return RTAcpiTblStringAppend(hAcpiTbl, &szName[0]);
 }