Mercurial > mplayer.hg
comparison mp_msg.c @ 19549:5680696f964b
Mixed up from and to charsets in iconv open failure message.
Patch by Zuxy Meng zuxy.meng at gmail com.
author | reimar |
---|---|
date | Sun, 27 Aug 2006 08:10:07 +0000 |
parents | 4231482179b6 |
children | 04cea12cd324 |
comparison
equal
deleted
inserted
replaced
19548:42f586994f97 | 19549:5680696f964b |
---|---|
91 msgiconv = iconv_open(mp_msg_charset, MSG_CHARSET); | 91 msgiconv = iconv_open(mp_msg_charset, MSG_CHARSET); |
92 old_charset = strdup(mp_msg_charset); | 92 old_charset = strdup(mp_msg_charset); |
93 } | 93 } |
94 if (msgiconv == (iconv_t)(-1)) { | 94 if (msgiconv == (iconv_t)(-1)) { |
95 fprintf(stderr,"iconv: conversion from %s to %s unsupported\n" | 95 fprintf(stderr,"iconv: conversion from %s to %s unsupported\n" |
96 ,mp_msg_charset,MSG_CHARSET); | 96 ,MSG_CHARSET,mp_msg_charset); |
97 }else{ | 97 }else{ |
98 memset(tmp2, 0, MSGSIZE_MAX); | 98 memset(tmp2, 0, MSGSIZE_MAX); |
99 while (iconv(msgiconv, &in, &inlen, &out, &outlen) == -1) { | 99 while (iconv(msgiconv, &in, &inlen, &out, &outlen) == -1) { |
100 if (!inlen || !outlen) | 100 if (!inlen || !outlen) |
101 break; | 101 break; |