Mercurial > vim
comparison src/os_mac_conv.c @ 13244:ac42c4b11dbc v8.0.1496
patch 8.0.1496: clearing a pointer takes two lines
commit https://github.com/vim/vim/commit/d23a823669d93fb2a570a039173eefe4856ac806
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 10 18:45:26 2018 +0100
patch 8.0.1496: clearing a pointer takes two lines
Problem: Clearing a pointer takes two lines.
Solution: Add VIM_CLEAR() and replace vim_clear(). (Hirohito Higashi,
closes #2629)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 10 Feb 2018 19:00:07 +0100 |
| parents | f67ac05fa3cd |
| children | ce04ebdf26b8 |
comparison
equal
deleted
inserted
replaced
| 13243:899b19739188 | 13244:ac42c4b11dbc |
|---|---|
| 478 if (result) | 478 if (result) |
| 479 { | 479 { |
| 480 if (TECConvertText(gPathConverter, decompPath, | 480 if (TECConvertText(gPathConverter, decompPath, |
| 481 decompLen, &decompLen, result, | 481 decompLen, &decompLen, result, |
| 482 decompLen, &actualLen) != noErr) | 482 decompLen, &actualLen) != noErr) |
| 483 { | 483 VIM_CLEAR(result); |
| 484 vim_free(result); | |
| 485 result = NULL; | |
| 486 } | |
| 487 } | 484 } |
| 488 } | 485 } |
| 489 | 486 |
| 490 if (precompLen) | 487 if (precompLen) |
| 491 *precompLen = actualLen; | 488 *precompLen = actualLen; |
| 515 { | 512 { |
| 516 TECFlushText(gUTF16ToUTF8Converter, result, (fromLen*6+1)*sizeof(char_u), &inputRead); | 513 TECFlushText(gUTF16ToUTF8Converter, result, (fromLen*6+1)*sizeof(char_u), &inputRead); |
| 517 utf8_len += inputRead; | 514 utf8_len += inputRead; |
| 518 } | 515 } |
| 519 else | 516 else |
| 520 { | 517 VIM_CLEAR(result); |
| 521 vim_free(result); | |
| 522 result = NULL; | |
| 523 } | |
| 524 } | 518 } |
| 525 else | 519 else |
| 526 { | 520 { |
| 527 result = NULL; | 521 result = NULL; |
| 528 } | 522 } |