Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replaced eolLF with normalizeEolLf.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-10-28 20:47:45 -07:00
parent 7cdcfdc94b
commit 53298802c1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/bx/string.h
View File

@@ -255,7 +255,7 @@ namespace bx
StringView strFindBlock(const StringView& _str, char _open, char _close);
// Normalize string to sane line endings.
void eolLF(char* _out, int32_t _size, const char* _str);
StringView normalizeEolLf(char* _out, int32_t _size, const StringView& _str);
// Finds identifier.
StringView findIdentifierMatch(const StringView& _str, const StringView& _word);

15
src/string.cpp
View File

@@ -643,12 +643,17 @@ namespace bx
return StringView(term, term);
}
void eolLF(char* _out, int32_t _size, const char* _str)
StringView normalizeEolLf(char* _out, int32_t _size, const StringView& _str)
{
const char* start = _out;
const char* end = _out;
if (0 < _size)
{
char* end = _out + _size - 1;
for (char ch = *_str++; ch != '\0' && _out < end; ch = *_str++)
const char* curr = _str.getPtr();
const char* term = _str.getTerm();
end = _out + _size;
for (char ch = *curr; curr != term && _out < end; ch = *(++curr) )
{
if ('\r' != ch)
{
@@ -656,8 +661,10 @@ namespace bx
}
}
*_out = '\0';
end = _out;
}
return StringView(start, end);
}
StringView findIdentifierMatch(const StringView& _str, const StringView& _word)