archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: correct variable name mixup in BLI_str_quoted_substrN

Browse Source 
Also expand doc-string for `BLI_str_escape_find_quote`
This commit is contained in:
Campbell Barton
2021-03-21 14:21:29 +11:00
parent dfefafa814
commit 9c0eb1700e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenlib/intern/string.c
View File

@@ -400,6 +400,11 @@ size_t BLI_str_unescape(char *__restrict dst, const char *__restrict src, const
/**
* Find the first un-escaped quote in the string (to find the end of the string).
*
* \param str: Typically this is the first character in a quoted string.
* Where the character before `*str` would be `"`.
* \return The pointer to the first un-escaped quote.
*/
const char *BLI_str_escape_find_quote(const char *str)
{
@@ -436,11 +441,11 @@ char *BLI_str_quoted_substrN(const char *__restrict str, const char *__restrict
/* get the end point (i.e. where the next occurrence of " is after the starting point) */
end_match = BLI_str_escape_find_quote(start_match);
if (end_match) {
const size_t unescaped_len = (size_t)(end_match - start_match);
char *result = MEM_mallocN(sizeof(char) * (unescaped_len + 1), __func__);
const size_t escaped_len = BLI_str_unescape(result, start_match, unescaped_len);
if (escaped_len != unescaped_len) {
result = MEM_reallocN(result, sizeof(char) * (escaped_len + 1));
const size_t escaped_len = (size_t)(end_match - start_match);
char *result = MEM_mallocN(sizeof(char) * (escaped_len + 1), __func__);
const size_t unescaped_len = BLI_str_unescape(result, start_match, escaped_len);
if (unescaped_len != escaped_len) {
result = MEM_reallocN(result, sizeof(char) * (unescaped_len + 1));
}
return result;
}