~ubuntu-branches/debian/jessie/glib2.0/jessie

« back to all changes in this revision

Viewing changes to glib/win_iconv.c

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2009-02-15 13:00:43 UTC
  • mfrom: (1.3.1 upstream) (69.1.10 intrepid)
  • Revision ID: james.westby@ubuntu.com-20090215130043-q47fbt3owmt42m2f
Tags: 2.18.4-2
* Release to unstable
* debian/rules:
- bump SHVER, since we are already forcing a 2.18.0 dependecy on the
  symbols introduced in the development versions
* debian/control.in:
- added Homepage and Vcs-* control fields

Show diffs side-by-side

added added

removed removed

Lines of Context:
1362
1362
    len = cv->mblen(cv, buf, bufsize);
1363
1363
    if (len == -1)
1364
1364
        return -1;
 
1365
    /* If converting from ASCII, reject 8bit
 
1366
     * chars. MultiByteToWideChar() doesn't. Note that for ASCII we
 
1367
     * know that the mblen function is sbcs_mblen() so len is 1.
 
1368
     */
 
1369
    if (cv->codepage == 20127 && buf[0] >= 0x80)
 
1370
        return_error(EILSEQ);
1365
1371
    *wbufsize = MultiByteToWideChar(cv->codepage, mbtowc_flags (cv->codepage),
1366
1372
            (const char *)buf, len, (wchar_t *)wbuf, *wbufsize);
1367
1373
    if (*wbufsize == 0)