oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag/FixString: use IsPrintableASCII()

Browse Source
This commit is contained in:
Max Kellermann 2020-04-24 15:41:06 +02:00
parent c021efced1
commit cc72ceb368
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tag/FixString.cxx
View File

@ -19,6 +19,7 @@
#include "FixString.hxx" #include "FixString.hxx"
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
#include "util/CharUtil.hxx"
#include "util/WritableBuffer.hxx" #include "util/WritableBuffer.hxx"
#include "util/StringView.hxx" #include "util/StringView.hxx"
#include "util/UTF8.hxx" #include "util/UTF8.hxx"
@ -84,17 +85,11 @@ fix_utf8(StringView p)
return patch_utf8(p, invalid); return patch_utf8(p, invalid);
} }
static bool
char_is_non_printable(unsigned char ch)
{
return ch < 0x20;
}
static const char * static const char *
find_non_printable(StringView p) find_non_printable(StringView p)
{ {
for (const char &ch : p) for (const char &ch : p)
if (char_is_non_printable(ch)) if (!IsPrintableASCII(ch))
return &ch; return &ch;
return nullptr; return nullptr;
@ -114,7 +109,7 @@ clear_non_printable(StringView src)
char *dest = (char *)xmemdup(src.data, src.size); char *dest = (char *)xmemdup(src.data, src.size);
for (size_t i = first - src.data; i < src.size; ++i) for (size_t i = first - src.data; i < src.size; ++i)
if (char_is_non_printable(dest[i])) if (!IsPrintableASCII(dest[i]))
dest[i] = ' '; dest[i] = ' ';
return { dest, src.size }; return { dest, src.size };