diff options
author | Christian Weisgerber <naddy@FreeBSD.org> | 2002-03-26 02:49:06 +0000 |
---|---|---|
committer | Christian Weisgerber <naddy@FreeBSD.org> | 2002-03-26 02:49:06 +0000 |
commit | f2107e4728e5b53cc99637e66c38245fedf4686c (patch) | |
tree | bec8ce9955060eff8a5baef02962b0f044aec75c /audio/vorbis-tools/files/patch-share::iconvert.c | |
parent | Make startup script pass arguments. (diff) |
* Fix encoding of raw files.
Obtained from: Xiph CVS
* Re-enable assert()s now that we use GNU iconv.
Diffstat (limited to 'audio/vorbis-tools/files/patch-share::iconvert.c')
-rw-r--r-- | audio/vorbis-tools/files/patch-share::iconvert.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/audio/vorbis-tools/files/patch-share::iconvert.c b/audio/vorbis-tools/files/patch-share::iconvert.c deleted file mode 100644 index 407ea9d47a91..000000000000 --- a/audio/vorbis-tools/files/patch-share::iconvert.c +++ /dev/null @@ -1,29 +0,0 @@ - -$FreeBSD$ - ---- share/iconvert.c.orig Wed Dec 19 03:57:31 2001 -+++ share/iconvert.c Thu Feb 14 16:52:41 2002 -@@ -105,10 +105,12 @@ - obl = utflen; - for (;;) { - k = iconv(cd1, &ib, &ibl, &ob, &obl); -+#if 0 /* mistaken assumptions */ - assert((!k && !ibl) || - (k == (size_t)(-1) && errno == E2BIG && ibl && obl < 6) || - (k == (size_t)(-1) && - (errno == EILSEQ || errno == EINVAL) && ibl)); -+#endif - if (!ibl) - break; - if (obl < 6) { -@@ -216,8 +218,10 @@ - } - } - k = iconv(cd2, 0, 0, &ob, &obl); -+#if 0 - assert(!k); - assert(!obl); -+#endif - *ob = '\0'; - - free(utfbuf); |