Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 0 deletions

diff --git a/toolkit/mozapps/update/common/readstrings.h b/toolkit/mozapps/update/common/readstrings.h
index 9e0ebbefb5..8fa8a49756 100644
--- a/toolkit/mozapps/update/common/readstrings.h
+++ b/toolkit/mozapps/update/common/readstrings.h
@@ -24,6 +24,15 @@ struct StringTable {
   mozilla::UniquePtr<char[]> info;
 };
 
+struct MARChannelStringTable {
+  MARChannelStringTable() {
+    MARChannelID = mozilla::MakeUnique<char[]>(1);
+    MARChannelID[0] = '\0';
+  }
+
+  mozilla::UniquePtr<char[]> MARChannelID;
+};
+
 /**
  * This function reads in localized strings from updater.ini
  */
@@ -38,6 +47,15 @@ int ReadStrings(const NS_tchar* path, const char* keyList,
                 const char* section = nullptr);
 
 /**
+ * This function reads in localized strings corresponding to the keys from a
+ * given string buffer.
+ */
+int ReadStringsFromBuffer(char* stringBuffer, const char* keyList,
+                          unsigned int numStrings,
+                          mozilla::UniquePtr<char[]>* results,
+                          const char* section = nullptr);
+
+/**
  * This class is meant to be a slightly cleaner interface into the ReadStrings
  * function.
  */