Merge pull request #731 from yuriks/app-info

Kernel: Process class and ExHeader caps parsing

3 files changed, 16 insertions, 0 deletions

diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index 91b74c6bc..fde0f3a59 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -15,6 +15,8 @@
 #define b32(x)  (b16(x) | (b16(x) >>16) )
 #define ROUND_UP_POW2(x)    (b32(x - 1) + 1)
 
+#define BIT(x) (1U << (x))
+
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
 /// Textually concatenates two tokens. The double-expansion is required by the C preprocessor.
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 3a6e51daa..7dc0ba7ba 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -477,4 +477,12 @@ std::string SHIFTJISToUTF8(const std::string& input)
 
 #endif
 
+std::string StringFromFixedZeroTerminatedBuffer(const char * buffer, size_t max_len) {
+    size_t len = 0;
+    while (len < max_len && buffer[len] != '\0')
+        ++len;
+
+    return std::string(buffer, len);
+}
+
 }
diff --git a/src/common/string_util.h b/src/common/string_util.h
index 356da5b60..fdc410499 100644
--- a/src/common/string_util.h
+++ b/src/common/string_util.h
@@ -128,4 +128,10 @@ bool ComparePartialString(InIt begin, InIt end, const char* other) {
     return (begin == end) == (*other == '\0');
 }
 
+/**
+ * Creates a std::string from a fixed-size NUL-terminated char buffer. If the buffer isn't
+ * NUL-terminated then the string ends at max_len characters.
+ */
+std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_len);
+
 }