diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-01-19 15:09:53 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-01-19 15:09:53 +0100 |
| commit | 5f0f8d749db5f005f72978a31959be4bfe46b495 (patch) | |
| tree | 7660d999c461b712e4d825862cb812c0feaab476 /src/basic/extract-word.c | |
| parent | bcbd1d0cd5a1e6ff068f251c99ed7905223fed67 (diff) | |
| parent | b3b0c23a56a2506a0d181af2f1775e3a98966c49 (diff) | |
Merge pull request #2357 from keszybz/warnings-2
Remove gcc warnings v2
Diffstat (limited to 'src/basic/extract-word.c')
| -rw-r--r-- | src/basic/extract-word.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/basic/extract-word.c b/src/basic/extract-word.c index 7cc2a1de13..090d2a7884 100644 --- a/src/basic/extract-word.c +++ b/src/basic/extract-word.c @@ -108,8 +108,9 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra if (flags & EXTRACT_CUNESCAPE) { uint32_t u; + bool eight_bit = false; - r = cunescape_one(*p, (size_t) -1, &c, &u); + r = cunescape_one(*p, (size_t) -1, &u, &eight_bit); if (r < 0) { if (flags & EXTRACT_CUNESCAPE_RELAX) { s[sz++] = '\\'; @@ -119,10 +120,10 @@ int extract_first_word(const char **p, char **ret, const char *separators, Extra } else { (*p) += r - 1; - if (c != 0) - s[sz++] = c; /* normal explicit char */ + if (eight_bit) + s[sz++] = u; else - sz += utf8_encode_unichar(s + sz, u); /* unicode chars we'll encode as utf8 */ + sz += utf8_encode_unichar(s + sz, u); } } else s[sz++] = c; |