diff options
| author | 2015-05-06 21:32:52 -0300 | |
|---|---|---|
| committer | 2015-05-08 03:03:06 -0300 | |
| commit | 8809d02db350960fc7824f5ae5bc161960910fd9 (patch) | |
| tree | 0b96738d281f5a8c5807ead73b7570e0e931701e | |
| parent | Core: Fix sorting in CMakeFiles.txt (diff) | |
| download | yuzu-8809d02db350960fc7824f5ae5bc161960910fd9.tar.gz yuzu-8809d02db350960fc7824f5ae5bc161960910fd9.tar.xz yuzu-8809d02db350960fc7824f5ae5bc161960910fd9.zip | |
Common: Add StringFromFixedZeroTerminatedBuffer
Diffstat (limited to '')
| -rw-r--r-- | src/common/string_util.cpp | 8 | ||||
| -rw-r--r-- | src/common/string_util.h | 6 |
2 files changed, 14 insertions, 0 deletions
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) | |||
| 477 | 477 | ||
| 478 | #endif | 478 | #endif |
| 479 | 479 | ||
| 480 | std::string StringFromFixedZeroTerminatedBuffer(const char * buffer, size_t max_len) { | ||
| 481 | size_t len = 0; | ||
| 482 | while (len < max_len && buffer[len] != '\0') | ||
| 483 | ++len; | ||
| 484 | |||
| 485 | return std::string(buffer, len); | ||
| 486 | } | ||
| 487 | |||
| 480 | } | 488 | } |
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) { | |||
| 128 | return (begin == end) == (*other == '\0'); | 128 | return (begin == end) == (*other == '\0'); |
| 129 | } | 129 | } |
| 130 | 130 | ||
| 131 | /** | ||
| 132 | * Creates a std::string from a fixed-size NUL-terminated char buffer. If the buffer isn't | ||
| 133 | * NUL-terminated then the string ends at max_len characters. | ||
| 134 | */ | ||
| 135 | std::string StringFromFixedZeroTerminatedBuffer(const char* buffer, size_t max_len); | ||
| 136 | |||
| 131 | } | 137 | } |