mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 06:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove OOM error handling code after calls to transstr()

Browse Source 
transstr() doesn't return NULL anymore.
This commit is contained in:
Felipe Oliveira Carvalho
2014-04-04 15:35:33 -03:00
committed by Thiago de Arruda
parent b8bda77e39
commit b4545740fd
3 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/charset.c
View File

@@ -330,7 +330,7 @@ void trans_characters(char_u *buf, int bufsize)
///
/// @param s
///
/// @return translated string or NULL if out of memory.
/// @return translated string
char_u *transstr(char_u *s)
{
char_u *res;
@@ -371,26 +371,25 @@ char_u *transstr(char_u *s)
res = alloc((unsigned)(vim_strsize(s) + 1));
}
if (res != NULL) {
*res = NUL;
p = s;
*res = NUL;
p = s;
while (*p != NUL) {
if (has_mbyte && ((l = (*mb_ptr2len)(p)) > 1)) {
c = (*mb_ptr2char)(p);
while (*p != NUL) {
if (has_mbyte && ((l = (*mb_ptr2len)(p)) > 1)) {
c = (*mb_ptr2char)(p);
if (vim_isprintc(c)) {
// append printable multi-byte char
STRNCAT(res, p, l);
} else {
transchar_hex(res + STRLEN(res), c);
}
p += l;
if (vim_isprintc(c)) {
// append printable multi-byte char
STRNCAT(res, p, l);
} else {
STRCAT(res, transchar_byte(*p++));
transchar_hex(res + STRLEN(res), c);
}
p += l;
} else {
STRCAT(res, transchar_byte(*p++));
}
}
return res;
}