← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vim/maverick

« back to all changes in this revision

Viewing changes to src/mbyte.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-01-13 18:39:18 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20090113183918-kgq1jzdwsbbex4pq
Tags: 2:7.2.079-1ubuntu1
https://launchpad.net/bugs/296324
* Resynchronise with Debian (diversions fix closes LP: #296324). Remaining
  changes:
  - runtime/syntax/debcontrol.vim:
    + Add "metapackages" to the list of valid sections.
  - runtime/syntax/debchangelog.vim:
    + Add "jaunty" to the list of valid suites.
  - Drop vim-lesstif package and lesstif2-dev build-dependency.
  - Enable Python interpreter on basic builds.
  - Create a .pot file for translations.
  - Disable autoindent, line-wrapping, and backup files by default.
  - runtime/syntax/debsources.vim:
    + Add "jaunty" to debsourcesDistrKeyword
  - runtime/syntax/grub.vim:
    + Add Ubuntu-specific 'quiet' keyword.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mbyte.c
717
717
                     * where mblen() returns 0 for invalid character.
718
718
                     * Therefore, following condition includes 0.
719
719
                     */
720
 
                    (void)mblen(NULL, 0);       /* First reset the state. */
 
720
                    ignored = mblen(NULL, 0);   /* First reset the state. */
721
721
                    if (mblen(buf, (size_t)1) <= 0)
722
722
                        n = 2;
723
723
                    else
3131
3131
        else
3132
3132
            s = p + 1;
3133
3133
    }
3134
 
    for (i = 0; s[i] != NUL && s + i < buf + sizeof(buf) - 1; ++i)
 
3134
    for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
3135
3135
    {
3136
3136
        if (s[i] == '_' || s[i] == '-')
3137
3137
            buf[i] = '-';
5278
5278
 
5279
5279
/*ARGSUSED*/
5280
5280
    static void
5281
 
preedit_start_cbproc(XIC xic, XPointer client_data, XPointer call_data)
 
5281
preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
5282
5282
{
5283
5283
#ifdef XIM_DEBUG
5284
5284
    xim_log("xim_decide_input_style()\n");
5312
5312
 
5313
5313
/*ARGSUSED*/
5314
5314
    static void
5315
 
preedit_draw_cbproc(XIC xic, XPointer client_data, XPointer call_data)
 
5315
preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
5316
5316
{
5317
5317
    XIMPreeditDrawCallbackStruct *draw_data;
5318
5318
    XIMText     *text;
5384
5384
                        draw_feedback = (char *)alloc(draw_data->chg_first
5385
5385
                                                              + text->length);
5386
5386
                    else
5387
 
                        draw_feedback = realloc(draw_feedback,
 
5387
                        draw_feedback = vim_realloc(draw_feedback,
5388
5388
                                         draw_data->chg_first + text->length);
5389
5389
                    if (draw_feedback != NULL)
5390
5390
                    {
5453
5453
 
5454
5454
/*ARGSUSED*/
5455
5455
    static void
5456
 
preedit_caret_cbproc(XIC xic, XPointer client_data, XPointer call_data)
 
5456
preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
5457
5457
{
5458
5458
#ifdef XIM_DEBUG
5459
5459
    xim_log("preedit_caret_cbproc()\n");
5462
5462
 
5463
5463
/*ARGSUSED*/
5464
5464
    static void
5465
 
preedit_done_cbproc(XIC xic, XPointer client_data, XPointer call_data)
 
5465
preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
5466
5466
{
5467
5467
#ifdef XIM_DEBUG
5468
5468
    xim_log("preedit_done_cbproc()\n");
6101
6101
 
6102
6102
            /* 1. codepage/UTF-8  ->  ucs-2. */
6103
6103
            if (vcp->vc_cpfrom == 0)
6104
 
                tmp_len = utf8_to_ucs2(ptr, len, NULL, NULL);
 
6104
                tmp_len = utf8_to_utf16(ptr, len, NULL, NULL);
6105
6105
            else
6106
6106
                tmp_len = MultiByteToWideChar(vcp->vc_cpfrom, 0,
6107
6107
                                                              ptr, len, 0, 0);
6109
6109
            if (tmp == NULL)
6110
6110
                break;
6111
6111
            if (vcp->vc_cpfrom == 0)
6112
 
                utf8_to_ucs2(ptr, len, tmp, unconvlenp);
 
6112
                utf8_to_utf16(ptr, len, tmp, unconvlenp);
6113
6113
            else
6114
6114
                MultiByteToWideChar(vcp->vc_cpfrom, 0, ptr, len, tmp, tmp_len);
6115
6115
 
6116
6116
            /* 2. ucs-2  ->  codepage/UTF-8. */
6117
6117
            if (vcp->vc_cpto == 0)
6118
 
                retlen = ucs2_to_utf8(tmp, tmp_len, NULL);
 
6118
                retlen = utf16_to_utf8(tmp, tmp_len, NULL);
6119
6119
            else
6120
6120
                retlen = WideCharToMultiByte(vcp->vc_cpto, 0,
6121
6121
                                                    tmp, tmp_len, 0, 0, 0, 0);
6123
6123
            if (retval != NULL)
6124
6124
            {
6125
6125
                if (vcp->vc_cpto == 0)
6126
 
                    ucs2_to_utf8(tmp, tmp_len, retval);
 
6126
                    utf16_to_utf8(tmp, tmp_len, retval);
6127
6127
                else
6128
6128
                    WideCharToMultiByte(vcp->vc_cpto, 0,
6129
6129
                                          tmp, tmp_len, retval, retlen, 0, 0);