Changeset fdc31525a74c563d8375491d7bd77b0e0a936ef7
- Timestamp:
- 07/05/08 23:10:26
(2 months ago)
- Author:
- Rémi Denis-Courmont <rdenis@simphalempin.com>
- git-committer:
- Rémi Denis-Courmont <rdenis@simphalempin.com> 1215292226 +0300
- git-parent:
[c5942976c0b820a187b5997151c34516ef9880cb]
- git-author:
- Rémi Denis-Courmont <rdenis@simphalempin.com> 1215292226 +0300
- Message:
iconv: don't pretend it is present and do crap when it's not
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r0b06fc5 |
rfdc3152 |
|
| 418 | 418 | return iconv_open( tocode, fromcode ); |
|---|
| 419 | 419 | #else |
|---|
| 420 | | return NULL; |
|---|
| | 420 | return (vlc_iconv_t)(-1); |
|---|
| 421 | 421 | #endif |
|---|
| 422 | 422 | } |
|---|
| … | … | |
| 429 | 429 | outbuf, outbytesleft ); |
|---|
| 430 | 430 | #else |
|---|
| 431 | | int i_bytes; |
|---|
| 432 | | |
|---|
| 433 | | if (inbytesleft == NULL || outbytesleft == NULL) |
|---|
| 434 | | { |
|---|
| 435 | | return 0; |
|---|
| 436 | | } |
|---|
| 437 | | |
|---|
| 438 | | i_bytes = __MIN(*inbytesleft, *outbytesleft); |
|---|
| 439 | | if( !inbuf || !outbuf || !i_bytes ) return (size_t)(-1); |
|---|
| 440 | | memcpy( *outbuf, *inbuf, i_bytes ); |
|---|
| 441 | | inbuf += i_bytes; |
|---|
| 442 | | outbuf += i_bytes; |
|---|
| 443 | | inbytesleft -= i_bytes; |
|---|
| 444 | | outbytesleft -= i_bytes; |
|---|
| 445 | | return i_bytes; |
|---|
| | 431 | abort (); |
|---|
| 446 | 432 | #endif |
|---|
| 447 | 433 | } |
|---|
| … | … | |
| 452 | 438 | return iconv_close( cd ); |
|---|
| 453 | 439 | #else |
|---|
| 454 | | return 0; |
|---|
| | 440 | abort (); |
|---|
| 455 | 441 | #endif |
|---|
| 456 | 442 | } |
|---|
